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/tdm | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/tdm')
| -rw-r--r-- | kcontrol/tdm/background.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/main.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-conv.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-font.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-shut.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-users.cpp | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp index 4078bd393..139ae90b7 100644 --- a/kcontrol/tdm/background.cpp +++ b/kcontrol/tdm/background.cpp @@ -28,7 +28,7 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "../background/bgsettings.h" #include "../background/bgdialog.h" diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 43671c0ee..4a2c8e3ec 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -28,7 +28,7 @@ #include <tdeaboutdata.h> #include <kgenericfactory.h> #include <kimageio.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurldrag.h> #include "tdm-appear.h" diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 3457a2308..91d65ccd7 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -35,11 +35,11 @@ #include <tqcheckbox.h> #include <tqstyle.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kimageio.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <kiconloader.h> diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp index 105630f40..06a1b0443 100644 --- a/kcontrol/tdm/tdm-conv.cpp +++ b/kcontrol/tdm/tdm-conv.cpp @@ -33,7 +33,7 @@ #include <kdialog.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdm-conv.h" diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp index c0e317180..65dbea179 100644 --- a/kcontrol/tdm/tdm-font.cpp +++ b/kcontrol/tdm/tdm-font.cpp @@ -32,7 +32,7 @@ #include <kdialog.h> #include <ksimpleconfig.h> #include <tdefontrequester.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdm-font.h" diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp index 434b55ae2..80f96e134 100644 --- a/kcontrol/tdm/tdm-shut.cpp +++ b/kcontrol/tdm/tdm-shut.cpp @@ -30,7 +30,7 @@ #include <ksimpleconfig.h> #include <karrowbutton.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kurlrequester.h> diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index 65d57a894..d39d4048e 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -33,9 +33,9 @@ #include <kimageio.h> #include <kimagefilepreview.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurldrag.h> #include "tdm-users.h" |