diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
| commit | 508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch) | |
| tree | 1df40da8f05d010a3e175c3d48e3529cccf2e067 /kbabel/commonui | |
| parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
| download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/commonui')
| -rw-r--r-- | kbabel/commonui/cmdedit.cpp | 2 | ||||
| -rw-r--r-- | kbabel/commonui/context.cpp | 4 | ||||
| -rw-r--r-- | kbabel/commonui/finddialog.cpp | 4 | ||||
| -rw-r--r-- | kbabel/commonui/projectpref.cpp | 2 | ||||
| -rw-r--r-- | kbabel/commonui/projectprefwidgets.cpp | 4 | ||||
| -rw-r--r-- | kbabel/commonui/projectwizard.cpp | 4 | ||||
| -rw-r--r-- | kbabel/commonui/roughtransdlg.cpp | 6 | ||||
| -rw-r--r-- | kbabel/commonui/tdeactionselector.cpp | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp index 8d3658f4..e6db0b5b 100644 --- a/kbabel/commonui/cmdedit.cpp +++ b/kbabel/commonui/cmdedit.cpp @@ -38,7 +38,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqtoolbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 0ae00003..bd05078b 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -49,8 +49,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdeversion.h> #include <tdeio/netaccess.h> diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index 0fe463fd..b58cf7bf 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -45,8 +45,8 @@ #include <kcombobox.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp index 34f5223b..e2d3ced0 100644 --- a/kbabel/commonui/projectpref.cpp +++ b/kbabel/commonui/projectpref.cpp @@ -42,7 +42,7 @@ #include <tqvbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index f07ba99f..8ecc12db 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -43,11 +43,11 @@ #include <kcombobox.h> #include <kdatatool.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdefiledialog.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <kurlcompletion.h> #include <tdefontdialog.h> diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index 8365d038..79266489 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -40,9 +40,9 @@ #include <tqcombobox.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> using namespace KBabel; diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index 7ed5d604..677b68ee 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -53,9 +53,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprogress.h> diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp index fd497a4b..8b56ae47 100644 --- a/kbabel/commonui/tdeactionselector.cpp +++ b/kbabel/commonui/tdeactionselector.cpp @@ -30,7 +30,7 @@ #include "tdeactionselector.h" #include <resources.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> // for spacingHint() #include <kdebug.h> |