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 /kcontrol/samba | |
| 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 'kcontrol/samba')
| -rw-r--r-- | kcontrol/samba/kcmsambaimports.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/samba/kcmsambalog.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/samba/kcmsambastatistics.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/samba/ksmbstatus.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index caa785605..c25867fa5 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <stdio.h> diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index b6bceb31f..c25a01113 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -25,9 +25,9 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcmsambalog.h" #include "kcmsambalog.moc" diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index b4b32611c..3b77dbc9f 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -32,8 +32,8 @@ #include <tqpushbutton.h> #include <tqregexp.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index cd5457de1..abd423d13 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include "ksmbstatus.h" |