diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
| commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
| tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /kbabel/catalogmanager | |
| parent | b9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff) | |
| download | tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/catalogmanager')
| -rw-r--r-- | kbabel/catalogmanager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kbabel/catalogmanager/catalogmanager.cpp | 4 | ||||
| -rw-r--r-- | kbabel/catalogmanager/catalogmanagerview.cpp | 6 | ||||
| -rw-r--r-- | kbabel/catalogmanager/findinfilesdialog.cpp | 2 | ||||
| -rw-r--r-- | kbabel/catalogmanager/libcvs/cvsdialog.cpp | 2 | ||||
| -rw-r--r-- | kbabel/catalogmanager/libsvn/svndialog.cpp | 2 | ||||
| -rw-r--r-- | kbabel/catalogmanager/markpatterndialog.cpp | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/kbabel/catalogmanager/CMakeLists.txt b/kbabel/catalogmanager/CMakeLists.txt index c9d8443e..646a0f78 100644 --- a/kbabel/catalogmanager/CMakeLists.txt +++ b/kbabel/catalogmanager/CMakeLists.txt @@ -46,7 +46,7 @@ tde_add_executable( catalogmanager LINK catalogmanager-static catalogmanagercvs-static catalogmanagersvn-static kbabelcommonui-static kbabeldict-static - kbabelcommon-shared kbabeldictplugin-shared kio-shared + kbabelcommon-shared kbabeldictplugin-shared tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index e2992d21..41c18005 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -52,12 +52,12 @@ #include <kapplication.h> #include <kaction.h> #include <kcmenumngr.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcursor.h> #include <kdatatool.h> #include <kdialogbase.h> //#include <kedittoolbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index c2fffb9e..de3ebf60 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -60,14 +60,14 @@ #include <klocale.h> #include <kglobal.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdatatool.h> #include <kiconloader.h> #include <kmessagebox.h> #include <kapplication.h> #include <kaction.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <kprogress.h> #include <twin.h> #include <tdeversion.h> diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp index b035666a..be293012 100644 --- a/kbabel/catalogmanager/findinfilesdialog.cpp +++ b/kbabel/catalogmanager/findinfilesdialog.cpp @@ -37,7 +37,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp index 054e8489..27eee88f 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp +++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp @@ -46,7 +46,7 @@ #include <tqtextedit.h> #include <tqtextcodec.h> // KDE include files -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp index c5f8c24a..083ce22d 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.cpp +++ b/kbabel/catalogmanager/libsvn/svndialog.cpp @@ -45,7 +45,7 @@ #include <tqstringlist.h> #include <tqtextedit.h> // KDE include files -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp index 21e5eadc..7b033235 100644 --- a/kbabel/catalogmanager/markpatterndialog.cpp +++ b/kbabel/catalogmanager/markpatterndialog.cpp @@ -38,7 +38,7 @@ #include <kcombobox.h> #include <kcompletion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <tdeparts/componentfactory.h> |