diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:55 -0600 |
| commit | d318087925a540a204c9d3820d5a09fbda58b8b2 (patch) | |
| tree | b8dde6aa5d6559b81c6667d8364a4364c27bcba4 /kandy/src | |
| parent | 6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff) | |
| download | tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kandy/src')
| -rw-r--r-- | kandy/src/kandy.cpp | 6 | ||||
| -rw-r--r-- | kandy/src/kandy.h | 2 | ||||
| -rw-r--r-- | kandy/src/kandyprefsdialog.cpp | 2 | ||||
| -rw-r--r-- | kandy/src/mobilemain.cpp | 6 | ||||
| -rw-r--r-- | kandy/src/mobilemain.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index c46f96874..7877cd9f8 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -33,7 +33,7 @@ #include <kiconloader.h> #include <kmenubar.h> #include <kkeydialog.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> #include <tdeconfig.h> @@ -43,8 +43,8 @@ #include <kmessagebox.h> #include <kstandarddirs.h> #include <kedittoolbar.h> -#include <kstdaccel.h> -#include <kaction.h> +#include <tdestdaccel.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kurldrag.h> diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h index 10147d772..54e3dc2a4 100644 --- a/kandy/src/kandy.h +++ b/kandy/src/kandy.h @@ -29,7 +29,7 @@ #endif #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kandyview.h" diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 3be5ed72d..76dfb8008 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -41,7 +41,7 @@ #include <kdebug.h> #include <klocale.h> #include <kglobal.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kcolordialog.h> diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index e66909394..788fdc9bd 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <kmenubar.h> #include <kkeydialog.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> @@ -35,8 +35,8 @@ #include <kedittoolbar.h> #include <kurldrag.h> -#include <kstdaccel.h> -#include <kaction.h> +#include <tdestdaccel.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tqpushbutton.h> diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h index b27124c66..1b7a7f427 100644 --- a/kandy/src/mobilemain.h +++ b/kandy/src/mobilemain.h @@ -29,7 +29,7 @@ #endif #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kandyprefs.h" |