diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:15 -0600 |
| commit | d1a3a8be39153e02cd555cb7e3bafcab2cb4530c (patch) | |
| tree | 089977dfeabf9a98c001fcb92ccd5bf05dc81488 /lilo-config | |
| parent | 666824a6c549fb4eeae7a29083349638974a57d7 (diff) | |
| download | tdeadmin-d1a3a8be39153e02cd555cb7e3bafcab2cb4530c.tar.gz tdeadmin-d1a3a8be39153e02cd555cb7e3bafcab2cb4530c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'lilo-config')
| -rw-r--r-- | lilo-config/kde-qt-common/ui.h | 4 | ||||
| -rw-r--r-- | lilo-config/kde/kcontrol.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lilo-config/kde-qt-common/ui.h b/lilo-config/kde-qt-common/ui.h index 1fb2573..b35a07d 100644 --- a/lilo-config/kde-qt-common/ui.h +++ b/lilo-config/kde-qt-common/ui.h @@ -33,8 +33,8 @@ #define _UI_H #ifdef USE_KDE -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <ktabctl.h> #include <kdialog.h> #include <tdefiledialog.h> diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp index f47bc21..bcce8aa 100644 --- a/lilo-config/kde/kcontrol.cpp +++ b/lilo-config/kde/kcontrol.cpp @@ -29,8 +29,8 @@ #include "kcontrol.moc" #include <mainwidget.h> #include <ui.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tdeaboutdata.h> #include <unistd.h> |