diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kicker/kicker/ui | |
parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kicker/kicker/ui')
-rw-r--r-- | kicker/kicker/ui/browser_dlg.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/ui/browser_mnu.cpp | 6 | ||||
-rw-r--r-- | kicker/kicker/ui/itemview.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/ui/k_mnu.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/ui/k_new_mnu.cpp | 12 | ||||
-rw-r--r-- | kicker/kicker/ui/service_mnu.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 6aa246eb6..3ebe095dc 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kglobal.h> #include <klocale.h> #include <kicondialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <kmessagebox.h> diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index c6ca4ab32..9aa352500 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -28,12 +28,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kdesktopfile.h> #include <kdirwatch.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kglobal.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <klocale.h> #include <kmimetype.h> #include <konq_operations.h> diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 3d33a825a..ee82bc91f 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpixmapeffect.h> #include <kaction.h> #include <kbookmarkmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <kglobalsettings.h> diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 84c977331..eb87f02d0 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kaboutkde.h> #include <kaction.h> #include <kbookmarkmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <kglobalsettings.h> diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 6f2c4eacb..f5bf25471 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -48,7 +48,7 @@ #include <kaboutkde.h> #include <kaction.h> #include <kbookmarkmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <kglobalsettings.h> @@ -70,8 +70,8 @@ #include <kbookmarkmanager.h> #include <kbookmark.h> #include <kprocess.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <dcopref.h> #include <konq_popupmenu.h> #include <konqbookmarkmanager.h> @@ -3512,16 +3512,16 @@ bool KMenu::ensureServiceRunning(const TQString & service) TQDataStream arg(data, IO_WriteOnly); arg << service << URLs; - if ( !kapp->dcopClient()->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)", + if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, replyData) ) { - tqWarning( "call to klauncher failed."); + tqWarning( "call to tdelauncher failed."); return false; } TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { - tqWarning( "unexpected result '%s' from klauncher.", replyType.data()); + tqWarning( "unexpected result '%s' from tdelauncher.", replyType.data()); return false; } int result; diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 1e77a1731..dfe3f4433 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdesycocaentry.h> #include <kservice.h> #include <kurldrag.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "global.h" #include "kicker.h" |