diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:08 -0600 |
| commit | 39177c1528006932b00136d34cf022434df73d72 (patch) | |
| tree | a0791bebede3e7eb454ac2268a14c4e8a157de6d /konq-plugins/kuick | |
| parent | 2a74bca8c834c4d4f391c70de8fdfa12a7cc972c (diff) | |
| download | tdeaddons-39177c1528006932b00136d34cf022434df73d72.tar.gz tdeaddons-39177c1528006932b00136d34cf022434df73d72.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/kuick')
| -rw-r--r-- | konq-plugins/kuick/Makefile.am | 2 | ||||
| -rw-r--r-- | konq-plugins/kuick/kimcontactmenu.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/kuick/kmetamenu.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/kuick/kuick_plugin.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/kuick/kuick_plugin.desktop | 2 | ||||
| -rw-r--r-- | konq-plugins/kuick/kuickplugin.desktop | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/konq-plugins/kuick/Makefile.am b/konq-plugins/kuick/Makefile.am index f0cfa4c..143b698 100644 --- a/konq-plugins/kuick/Makefile.am +++ b/konq-plugins/kuick/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkuickplugin.la # This is all standard. Remove the LIB_KHTML reference if you are not # using the KHTML Part libkuickplugin_la_SOURCES = kuick_plugin.cpp kdirmenu.cpp kmetamenu.cpp kimcontactmenu.cpp -libkuickplugin_la_LIBADD = $(LIB_KABC) -lkimproxy -lkonq +libkuickplugin_la_LIBADD = $(LIB_KABC) -ltdeimproxy -lkonq libkuickplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) pluginsdir = $(kde_servicesdir) diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index 77ef7a4..cdc5566 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -25,7 +25,7 @@ // The following enables kabc for contact name lookups instead of using Kopete's idea of their name. //#define KIMCONTACTS_USE_KABC -#include <kimproxy.h> +#include <tdeimproxy.h> #ifdef KIMCONTACTS_USE_KABC #include <kabc/addressbook.h> diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index aa4f0dd..efb85e2 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -18,7 +18,7 @@ */ #include <kiconloader.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include <kapplication.h> #include <klocale.h> #include <kconfig.h> diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 16e11fd..589f212 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -25,7 +25,7 @@ #include <kaction.h> #include <kinstance.h> #include <kiconloader.h> -#include <kimproxy.h> +#include <tdeimproxy.h> #include <klocale.h> #include <konq_popupmenu.h> #include <kmessagebox.h> diff --git a/konq-plugins/kuick/kuick_plugin.desktop b/konq-plugins/kuick/kuick_plugin.desktop index 8974546..ffab27f 100644 --- a/konq-plugins/kuick/kuick_plugin.desktop +++ b/konq-plugins/kuick/kuick_plugin.desktop @@ -62,6 +62,6 @@ Name[xh]=Ukhuphelo noHambiso lweKuick Name[zh_CN]=快速复制和移动 Name[zh_TW]=Kuick 複製與移動 Name[zu]=Kuick Khiphela futhi Ususe -Icon=kmultiple +Icon=tdemultiple X-TDE-Library=libkuickplugin ServiceTypes=KonqPopupMenu/Plugin,all/all diff --git a/konq-plugins/kuick/kuickplugin.desktop b/konq-plugins/kuick/kuickplugin.desktop index fe7b825..f015481 100644 --- a/konq-plugins/kuick/kuickplugin.desktop +++ b/konq-plugins/kuick/kuickplugin.desktop @@ -61,6 +61,6 @@ Name[xh]=Ukhuphelo noHambiso lweKuick Name[zh_CN]=快速复制和移动 Name[zh_TW]=Kuick 複製與移動 Name[zu]=Kuick Khiphela futhi Ususe -Icon=kmultiple +Icon=tdemultiple X-TDE-ParentApp=konqueror DocPath=konq-plugins/kuick/index.html |