diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:50:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:50:01 -0600 |
| commit | 20f605cd20f71cc4f7bcb81499dbe9e4a0c1316a (patch) | |
| tree | ed4155cda7f2cb146fb89a91a4ace9ca8e3d5d4e /src | |
| parent | 5eb5ddf6dc16015cd3dcca98d81d5d895a239820 (diff) | |
| download | ksplash-engine-moodin-20f605cd20f71cc4f7bcb81499dbe9e4a0c1316a.tar.gz ksplash-engine-moodin-20f605cd20f71cc4f7bcb81499dbe9e4a0c1316a.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/magiclabel.cpp | 4 | ||||
| -rw-r--r-- | src/thememoodin.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/magiclabel.cpp b/src/magiclabel.cpp index 3f603af..0613720 100644 --- a/src/magiclabel.cpp +++ b/src/magiclabel.cpp @@ -12,9 +12,9 @@ #include <tqstringlist.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kuser.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "magiclabel.h" diff --git a/src/thememoodin.cpp b/src/thememoodin.cpp index 9d4629e..d1711fa 100644 --- a/src/thememoodin.cpp +++ b/src/thememoodin.cpp @@ -13,10 +13,10 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kuser.h> |