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/hwmanager | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/hwmanager')
| -rw-r--r-- | kcontrol/hwmanager/deviceiconview.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlg.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp index 0255c01c1..cea27b161 100644 --- a/kcontrol/hwmanager/deviceiconview.cpp +++ b/kcontrol/hwmanager/deviceiconview.cpp @@ -21,11 +21,11 @@ #include <tqheader.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kservicegroup.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 2eb1dfa3f..5483b2d26 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -34,11 +34,11 @@ #include <kbuttonbox.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <klineedit.h> #include <kstdguiitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "devicepropsdlg.h" diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index bc3970e93..4ccb8ce8f 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -32,10 +32,10 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kinputdialog.h> #include <kurlrequester.h> |