diff options
| author | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
|---|---|---|
| committer | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
| commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
| tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /klipper | |
| 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 'klipper')
| -rw-r--r-- | klipper/applet.cpp | 4 | ||||
| -rw-r--r-- | klipper/configdialog.cpp | 2 | ||||
| -rw-r--r-- | klipper/klipperpopup.cpp | 8 | ||||
| -rw-r--r-- | klipper/main.cpp | 2 | ||||
| -rw-r--r-- | klipper/popupproxy.cpp | 2 | ||||
| -rw-r--r-- | klipper/toplevel.cpp | 8 | ||||
| -rw-r--r-- | klipper/urlgrabber.cpp | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/klipper/applet.cpp b/klipper/applet.cpp index 804f0a2ec..aaaf95232 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -21,8 +21,8 @@ #include "applet.h" #include <tdeaboutapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <dcopclient.h> #include <tdeconfig.h> diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 1a4c66e1f..467377202 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -27,7 +27,7 @@ #include <assert.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 1fa378f7f..41eabdbdf 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -19,17 +19,17 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <khelpmenu.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include "klipperpopup.h" diff --git a/klipper/main.cpp b/klipper/main.cpp index e32b37cf2..0cdc73af3 100644 --- a/klipper/main.cpp +++ b/klipper/main.cpp @@ -21,7 +21,7 @@ #include <stdio.h> #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <twin.h> #include <tdeaboutdata.h> diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index d5c572690..4811e8f98 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -23,7 +23,7 @@ #include <tqimage.h> #include <kstringhandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "historyitem.h" diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 1112fa06b..b30d551c1 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -35,11 +35,11 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kipc.h> #include <kkeydialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksavefile.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> @@ -48,7 +48,7 @@ #include <kurldrag.h> #include <twin.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <dcopclient.h> #include <kiconloader.h> #include <khelpmenu.h> diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index a7ccb305a..684e08c26 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <kdialogbase.h> #include <ktextedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kservice.h> #include <kiconloader.h> |