diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
| commit | 783715b853042d24841e3e888051f3a184e78a40 (patch) | |
| tree | 33ce107e439bb622368ba17b8a2a6485ef28e3b5 /kjots | |
| parent | 980088ed866120f458c10c1ec64295e84ad8ba82 (diff) | |
| download | tdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kjots')
| -rw-r--r-- | kjots/KJotsMain.cpp | 4 | ||||
| -rw-r--r-- | kjots/kjotsedit.cpp | 2 | ||||
| -rw-r--r-- | kjots/kjotsentry.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 088bc05..dfb8425 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -31,9 +31,9 @@ #include <kdebug.h> #include <keditcl.h> #include <kencodingfiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index 29fe021..420f715 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -26,7 +26,7 @@ #include <tdepopupmenu.h> #include <keditcl.h> -#include <klocale.h> +#include <tdelocale.h> #include <kopenwith.h> #include <kprinter.h> diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index 4bf0f5f..03581cf 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -29,11 +29,11 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/job.h> #include <assert.h> |