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 /kcontrol/kicker | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kicker')
| -rw-r--r-- | kcontrol/kicker/advancedDialog.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kicker/applettab_impl.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kicker/extensionInfo.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kicker/hidingconfig.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kicker/hidingtab_impl.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kicker/lookandfeelconfig.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kicker/lookandfeeltab_impl.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kicker/menuconfig.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kicker/menutab_impl.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kicker/positionconfig.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kicker/positiontab_impl.cpp | 2 |
11 files changed, 14 insertions, 14 deletions
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index a56625e4a..f2ba15680 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -25,7 +25,7 @@ #include <tqslider.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "advancedDialog.h" #include "advancedOptions.h" diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index 85f582ca4..c2f488550 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -28,8 +28,8 @@ #include <tqfileinfo.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdialog.h> #include <kstandarddirs.h> #include <tdelistview.h> diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index 037159d93..a773e063d 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include "extensionInfo.h" diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 810024479..e1e71dc86 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -18,7 +18,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "hidingtab_impl.h" diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp index 3bde445b8..8c340bd5d 100644 --- a/kcontrol/kicker/hidingtab_impl.cpp +++ b/kcontrol/kicker/hidingtab_impl.cpp @@ -23,7 +23,7 @@ #include <kcombobox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "main.h" diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index 49c0cf56a..af451421e 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -18,7 +18,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "lookandfeeltab_impl.h" diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index 73367d24d..674b1cd04 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -29,8 +29,8 @@ #include <kiconeffect.h> #include <kimageio.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kickerSettings.h> diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index b477cd76d..26624ff92 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -18,7 +18,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kickerSettings.h" diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index e3fc24ec9..2c259829f 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -32,8 +32,8 @@ #include <kdesktopfile.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstandarddirs.h> #include <tdefontrequester.h> diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 4eafcf677..a65a32341 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -18,7 +18,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "positiontab_impl.h" diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index ba392bcb2..63cdb35a9 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -29,7 +29,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpanelextension.h> #include <kpixmap.h> |