diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kfind | |
parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kfind')
-rw-r--r-- | kfind/kdatecombo.cpp | 4 | ||||
-rw-r--r-- | kfind/kfind.cpp | 2 | ||||
-rw-r--r-- | kfind/kfinddlg.cpp | 6 | ||||
-rw-r--r-- | kfind/kfindpart.cpp | 2 | ||||
-rw-r--r-- | kfind/kftabdlg.cpp | 6 | ||||
-rw-r--r-- | kfind/kfwin.cpp | 6 | ||||
-rw-r--r-- | kfind/kquery.cpp | 4 | ||||
-rw-r--r-- | kfind/main.cpp | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index d27ea7a3b..869753c5b 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -6,8 +6,8 @@ #include <tqtimer.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <kdebug.h> diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index 8908b26c8..b1afe1b05 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -31,7 +31,7 @@ #include <kdialog.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <tqlineedit.h> #include <tqcheckbox.h> diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index b426050a4..76fa6301c 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -7,11 +7,11 @@ #include <tqlayout.h> #include <tqpushbutton.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kguiitem.h> #include <kstatusbar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeaboutapplication.h> #include <kstandarddirs.h> diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 3f71bdfbd..54de01e9b 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -23,7 +23,7 @@ #include <tdeparts/genericfactory.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdir.h> #include <kinstance.h> diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 83e98aff2..c2df7aa67 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -17,11 +17,11 @@ #include <tqapplication.h> #include <kcalendarsystem.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcombobox.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index f06b1a2a9..7364aeb73 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -22,15 +22,15 @@ #include <tqdragobject.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <krun.h> #include <kprocess.h> #include <kpropertiesdialog.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdepopupmenu.h> #include <tdeio/netaccess.h> #include <kurldrag.h> diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index 514e6f918..1e3617c70 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -5,8 +5,8 @@ #include <tdefileitem.h> #include <tdefilemetainfo.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kzip.h> diff --git a/kfind/main.cpp b/kfind/main.cpp index 88aa60493..e0e8bc498 100644 --- a/kfind/main.cpp +++ b/kfind/main.cpp @@ -2,7 +2,7 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kopenwith.h> |