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 /twin/kcmtwin/twinoptions | |
| 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/twinoptions')
| -rw-r--r-- | twin/kcmtwin/twinoptions/main.cpp | 4 | ||||
| -rw-r--r-- | twin/kcmtwin/twinoptions/mouse.cpp | 4 | ||||
| -rw-r--r-- | twin/kcmtwin/twinoptions/windows.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index 6710208d7..e63ec54d5 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -22,8 +22,8 @@ #include <dcopclient.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kgenericfactory.h> #include <tdeaboutdata.h> diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 9715f4651..8778d915e 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -29,11 +29,11 @@ #include <tqtooltip.h> #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kseparator.h> #include <X11/X.h> diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 91a6232d2..74b8d3140 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -32,17 +32,17 @@ #include <tqradiobutton.h> #include <tqlabel.h> #include <tqcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kactivelabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <tdeconfig.h> #include <knuminput.h> #include <tdeapplication.h> #include <kdialog.h> #include <dcopclient.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> #include <tqtabwidget.h> |