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/filetypes | |
parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/filetypes')
-rw-r--r-- | kcontrol/filetypes/filegroupdetails.cpp | 2 | ||||
-rw-r--r-- | kcontrol/filetypes/filetypedetails.cpp | 2 | ||||
-rw-r--r-- | kcontrol/filetypes/filetypesview.cpp | 2 | ||||
-rw-r--r-- | kcontrol/filetypes/kservicelistwidget.cpp | 4 | ||||
-rw-r--r-- | kcontrol/filetypes/kserviceselectdlg.cpp | 2 | ||||
-rw-r--r-- | kcontrol/filetypes/newtypedlg.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp index eb57f50ac..7000a97e5 100644 --- a/kcontrol/filetypes/filegroupdetails.cpp +++ b/kcontrol/filetypes/filegroupdetails.cpp @@ -22,7 +22,7 @@ #include <tqradiobutton.h> #include <tqwhatsthis.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name ) : TQWidget( parent, name ) diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index 92a4f47ac..c4f3ce7bb 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -10,7 +10,7 @@ #include <kicondialog.h> #include <klineedit.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "kservicelistwidget.h" #include "filetypedetails.h" diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index f4011f3bf..58bbbbd09 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -15,7 +15,7 @@ #include <kipc.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "newtypedlg.h" diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp index e8193f278..d0463d7ad 100644 --- a/kcontrol/filetypes/kservicelistwidget.cpp +++ b/kcontrol/filetypes/kservicelistwidget.cpp @@ -26,8 +26,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kopenwith.h> diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp index b0cf1e3b1..f8c4f0dd4 100644 --- a/kcontrol/filetypes/kserviceselectdlg.cpp +++ b/kcontrol/filetypes/kserviceselectdlg.cpp @@ -20,7 +20,7 @@ #include "kserviceselectdlg.moc" #include "kservicelistwidget.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlabel.h> diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp index ee0e3eab8..dbb37344c 100644 --- a/kcontrol/filetypes/newtypedlg.cpp +++ b/kcontrol/filetypes/newtypedlg.cpp @@ -4,7 +4,7 @@ #include <tqwhatsthis.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include "newtypedlg.h" |