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 /libtdepim/komposer | |
| 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 'libtdepim/komposer')
| -rw-r--r-- | libtdepim/komposer/core/core.cpp | 12 | ||||
| -rw-r--r-- | libtdepim/komposer/core/core.h | 2 | ||||
| -rw-r--r-- | libtdepim/komposer/plugins/default/defaulteditor.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index 87da5c00e..79485f89c 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -33,18 +33,18 @@ #include <ktrader.h> #include <klibloader.h> #include <kstdaction.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <klocale.h> #include <kstatusbar.h> #include <kguiitem.h> -#include <kpopupmenu.h> -#include <kshortcut.h> +#include <tdepopupmenu.h> +#include <tdeshortcut.h> #include <kcmultidialog.h> -#include <kaction.h> -#include <kstdaccel.h> +#include <tdeaction.h> +#include <tdestdaccel.h> #include <kdebug.h> #include <tqwidgetstack.h> diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h index 5259710ae..92235a18f 100644 --- a/libtdepim/komposer/core/core.h +++ b/libtdepim/komposer/core/core.h @@ -24,7 +24,7 @@ #include "komposerIface.h" -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqptrlist.h> namespace KSettings { diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index 88c4fb1ea..accd10505 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -23,11 +23,11 @@ #include <kgenericfactory.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcolordialog.h> #include <tdefiledialog.h> #include <kinstance.h> |