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 /twin/kcmtwin/twinrules | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'twin/kcmtwin/twinrules')
| -rw-r--r-- | twin/kcmtwin/twinrules/detectwidget.cpp | 2 | ||||
| -rw-r--r-- | twin/kcmtwin/twinrules/kcm.cpp | 4 | ||||
| -rw-r--r-- | twin/kcmtwin/twinrules/main.cpp | 2 | ||||
| -rw-r--r-- | twin/kcmtwin/twinrules/ruleswidget.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp index b3646312a..f450938bc 100644 --- a/twin/kcmtwin/twinrules/detectwidget.cpp +++ b/twin/kcmtwin/twinrules/detectwidget.cpp @@ -19,7 +19,7 @@ #include "detectwidget.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <twin.h> #include <tqlabel.h> diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index 033967e6d..b137a7b09 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -18,9 +18,9 @@ #include "kcm.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tdeaboutdata.h> diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp index cc2b4499b..21cb007ec 100644 --- a/twin/kcmtwin/twinrules/main.cpp +++ b/twin/kcmtwin/twinrules/main.cpp @@ -20,7 +20,7 @@ #include <tdeapplication.h> #include <dcopclient.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <X11/Xlib.h> diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp index dcf7cd358..334001bf7 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.cpp +++ b/twin/kcmtwin/twinrules/ruleswidget.cpp @@ -25,11 +25,11 @@ #include <kpushbutton.h> #include <tqlabel.h> #include <twinmodule.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> #include <tqwhatsthis.h> #include <assert.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqtabwidget.h> #include <tqtimer.h> |