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 /ksmserver | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver')
| -rw-r--r-- | ksmserver/main.cpp | 4 | ||||
| -rw-r--r-- | ksmserver/server.cpp | 6 | ||||
| -rw-r--r-- | ksmserver/shutdown.cpp | 8 | ||||
| -rw-r--r-- | ksmserver/shutdowndlg.cpp | 4 | ||||
| -rw-r--r-- | ksmserver/startup.cpp | 6 | ||||
| -rw-r--r-- | ksmserver/startupdlg.cpp | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 91d45d031..1004c4394 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -20,8 +20,8 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include "server.h" diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 5e2d6b412..9b49ac43c 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -66,14 +66,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtimer.h> #include <tqregexp.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <tdeapplication.h> #include <kstaticdeleter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 0e740daf4..87b9836b1 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -66,14 +66,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtimer.h> #include <tqregexp.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <tdeapplication.h> #include <kstaticdeleter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <dcopclient.h> #include <dcopref.h> @@ -288,7 +288,7 @@ void KSMServer::shutdown( TDEApplication::ShutdownConfirm confirm, shutdownInternal( confirm, sdtype, sdmode ); } -#include <kmessagebox.h> +#include <tdemessagebox.h> void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption ) { diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 4dc8038ce..c71bd094e 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -37,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tqregexp.h> #include <tqeventloop.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kdebug.h> @@ -45,7 +45,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <kuser.h> #include <kpixmap.h> diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 3df79fc16..b1ed9992e 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -65,14 +65,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqguardedptr.h> #include <tqtimer.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <tdeapplication.h> #include <kstaticdeleter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp index 585d437ad..812ebc5cb 100644 --- a/ksmserver/startupdlg.cpp +++ b/ksmserver/startupdlg.cpp @@ -28,7 +28,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tqregexp.h> #include <tqeventloop.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kdebug.h> @@ -36,7 +36,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <kuser.h> #include <kpixmap.h> |