diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:58 -0600 |
| commit | f58c83bd2a477e1f70d9fc0c9e2dae42803dbd2b (patch) | |
| tree | 01c81e847142fa105954bd829c66706747e6adc7 /amor | |
| parent | a002e0879f1ee9759db789bde6d9f1cf9b99ea44 (diff) | |
| download | tdetoys-f58c83bd2a477e1f70d9fc0c9e2dae42803dbd2b.tar.gz tdetoys-f58c83bd2a477e1f70d9fc0c9e2dae42803dbd2b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'amor')
| -rw-r--r-- | amor/amor.cpp | 6 | ||||
| -rw-r--r-- | amor/amordialog.cpp | 2 | ||||
| -rw-r--r-- | amor/amortips.cpp | 2 | ||||
| -rw-r--r-- | amor/main.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp index cbbfd54..d98cbd1 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -35,9 +35,9 @@ #include <tqcursor.h> #include <tqvaluelist.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kstartupinfo.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdestartupinfo.h> #include <twin.h> #include <twinmodule.h> #include <kstandarddirs.h> diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp index ced2f7a..e38e88e 100644 --- a/amor/amordialog.cpp +++ b/amor/amordialog.cpp @@ -34,7 +34,7 @@ #include "amordialog.h" #include "amordialog.moc" #include "version.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <kstandarddirs.h> diff --git a/amor/amortips.cpp b/amor/amortips.cpp index e20e98f..6b3582f 100644 --- a/amor/amortips.cpp +++ b/amor/amortips.cpp @@ -28,7 +28,7 @@ #include <tdeapplication.h> #include "amortips.h" #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqregexp.h> #include <kdebug.h> diff --git a/amor/main.cpp b/amor/main.cpp index 4be2da7..79c0738 100644 --- a/amor/main.cpp +++ b/amor/main.cpp @@ -31,7 +31,7 @@ #include <time.h> #include <kuniqueapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <dcopclient.h> |