diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:05:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:05:39 -0600 |
| commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
| tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /kbabel/commonui | |
| 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/commonui')
| -rw-r--r-- | kbabel/commonui/context.cpp | 4 | ||||
| -rw-r--r-- | kbabel/commonui/finddialog.cpp | 2 | ||||
| -rw-r--r-- | kbabel/commonui/projectpref.h | 2 | ||||
| -rw-r--r-- | kbabel/commonui/projectprefwidgets.cpp | 2 | ||||
| -rw-r--r-- | kbabel/commonui/roughtransdlg.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index cf79f4b1..70a020a8 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -46,14 +46,14 @@ #include <tqregexp.h> #include <tqvgroupbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kurl.h> #include <tdeversion.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klibloader.h> #include <ktrader.h> diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index 222fbea1..4c3f3f55 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -44,7 +44,7 @@ #include <tqwhatsthis.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <tdeparts/componentfactory.h> diff --git a/kbabel/commonui/projectpref.h b/kbabel/commonui/projectpref.h index ca99bdea..0a72bf02 100644 --- a/kbabel/commonui/projectpref.h +++ b/kbabel/commonui/projectpref.h @@ -35,7 +35,7 @@ #ifndef PROJECTPREF_H #define PROJECTPREF_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <tqptrlist.h> class SavePreferences; diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index d4785445..63579dc8 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -45,7 +45,7 @@ #include <kdatatool.h> #include <klocale.h> #include <kdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <knuminput.h> #include <kmessagebox.h> #include <klineedit.h> diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index f19747e3..caf919e3 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -52,7 +52,7 @@ #include <tqwhatsthis.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <kmessagebox.h> |