diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kdesktop/lock | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/autologout.cc | 6 | ||||
| -rw-r--r-- | kdesktop/lock/infodlg.cc | 6 | ||||
| -rw-r--r-- | kdesktop/lock/lockdlg.cc | 6 | ||||
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 6 | ||||
| -rw-r--r-- | kdesktop/lock/main.cc | 6 | ||||
| -rw-r--r-- | kdesktop/lock/querydlg.cc | 6 | ||||
| -rw-r--r-- | kdesktop/lock/sakdlg.cc | 6 | ||||
| -rw-r--r-- | kdesktop/lock/securedlg.cc | 6 |
8 files changed, 24 insertions, 24 deletions
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc index 41a1946ec..07a68c50d 100644 --- a/kdesktop/lock/autologout.cc +++ b/kdesktop/lock/autologout.cc @@ -8,13 +8,13 @@ #include "autologout.h" #include <tdeapplication.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <kdebug.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index c241a1acd..97e2ea2a6 100644 --- a/kdesktop/lock/infodlg.cc +++ b/kdesktop/lock/infodlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index e8e0f901c..a3fe9828c 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -16,11 +16,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 604b93a84..f4b6278f5 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -40,9 +40,9 @@ #include <tdeapplication.h> #include <kservicegroup.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <klibloader.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 1d7475a90..377080d23 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -24,10 +24,10 @@ #include "kdesktopsettings.h" #include <tdecmdlineargs.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <dcopref.h> #include <ksimpleconfig.h> diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index f1f1d5171..a278fcb8b 100644 --- a/kdesktop/lock/querydlg.cc +++ b/kdesktop/lock/querydlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index 7a77feb0c..5fca73e24 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/kdesktop/lock/sakdlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc index 57e76ed14..d19df99a5 100644 --- a/kdesktop/lock/securedlg.cc +++ b/kdesktop/lock/securedlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tqlayout.h> |