diff options
author | Automated System <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:07:52 -0600 |
---|---|---|
committer | Automated System <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:07:52 -0600 |
commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /tdm | |
parent | b2502b94cf23298f676853d91188b2cacc6ab0bd (diff) | |
parent | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff) | |
download | tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'tdm')
-rw-r--r-- | tdm/kfrontend/kchooser.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/kconsole.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/kfdialog.cpp | 4 | ||||
-rw-r--r-- | tdm/kfrontend/kgapp.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/kgdialog.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/kgreeter.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/kgverify.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/krootimage.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/sakdlg.cc | 6 | ||||
-rw-r--r-- | tdm/kfrontend/tdmadmindialog.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/tdmconfig.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/tdmshutdown.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/themer/tdmitem.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/themer/tdmlabel.cpp | 4 | ||||
-rw-r--r-- | tdm/kfrontend/themer/tdmthemer.cpp | 2 |
15 files changed, 19 insertions, 19 deletions
diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp index 00b08cd35..9f0c714c0 100644 --- a/tdm/kfrontend/kchooser.cpp +++ b/tdm/kfrontend/kchooser.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "tdmconfig.h" #include "tdm_greet.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp index 834507bdb..bf1560aed 100644 --- a/tdm/kfrontend/kconsole.cpp +++ b/tdm/kfrontend/kconsole.cpp @@ -56,7 +56,7 @@ extern "C" { #include "tdmconfig.h" #include "tdm_greet.h" -#include <klocale.h> +#include <tdelocale.h> #include <kpty.h> #include <tqsocketnotifier.h> diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp index 4b3af723e..ba05b0294 100644 --- a/tdm/kfrontend/kfdialog.cpp +++ b/tdm/kfrontend/kfdialog.cpp @@ -25,10 +25,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "kfdialog.h" #include "tdmconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 190074074..37c8130c1 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kcrash.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #ifdef WITH_XRANDR #include <libtderandr/libtderandr.h> diff --git a/tdm/kfrontend/kgdialog.cpp b/tdm/kfrontend/kgdialog.cpp index 667eca8e1..5d5d2a186 100644 --- a/tdm/kfrontend/kgdialog.cpp +++ b/tdm/kfrontend/kgdialog.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "tdmshutdown.h" #include "tdm_greet.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tqaccel.h> diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index bc906d6d7..173b7def3 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/tdmlabel.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kseparator.h> #include <tdelistview.h> diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index 6cca08862..c78d20b9e 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/tdmitem.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <klibloader.h> #include <kseparator.h> #include <kstdguiitem.h> diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 63c7cc41e..7145eb18a 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -23,7 +23,7 @@ Boston, MA 02110-1301, USA. #include <tdecmdlineargs.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc index a73d349b3..d9f1a1e40 100644 --- a/tdm/kfrontend/sakdlg.cc +++ b/tdm/kfrontend/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/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp index 5c3c87bcc..7c792c083 100644 --- a/tdm/kfrontend/tdmadmindialog.cpp +++ b/tdm/kfrontend/tdmadmindialog.cpp @@ -30,7 +30,7 @@ #include <tdeapplication.h> #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/tdm/kfrontend/tdmconfig.cpp b/tdm/kfrontend/tdmconfig.cpp index 2b7b5ab26..2d68bf8ee 100644 --- a/tdm/kfrontend/tdmconfig.cpp +++ b/tdm/kfrontend/tdmconfig.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "tdm_greet.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdio.h> #include <stdlib.h> diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index 0e53ffe29..d8ab1635d 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tdeapplication.h> #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> #include <kprocio.h> diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index 13969c4bf..91ab5efda 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -29,7 +29,7 @@ #include "tdmlayout.h" #include "tdmconfig.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqframe.h> diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp index 8841eb22d..f2fae90a6 100644 --- a/tdm/kfrontend/themer/tdmlabel.cpp +++ b/tdm/kfrontend/themer/tdmlabel.cpp @@ -24,8 +24,8 @@ #include "tdmconfig.h" #include "../kgreeter.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kmacroexpander.h> #include <kdebug.h> diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp index da7580272..d485ab1ee 100644 --- a/tdm/kfrontend/themer/tdmthemer.cpp +++ b/tdm/kfrontend/themer/tdmthemer.cpp @@ -30,7 +30,7 @@ #include <kiconloader.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kdebug.h> |