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 /kontact/plugins/knotes | |
| 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 'kontact/plugins/knotes')
| -rw-r--r-- | kontact/plugins/knotes/knotes_part.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/knotes/knotes_part_p.h | 6 | ||||
| -rw-r--r-- | kontact/plugins/knotes/knotes_plugin.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index d73bd1fbe..9cdb854e9 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -24,7 +24,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kmessagebox.h> #include <libtdepim/infoextension.h> diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 648c94c2d..8e11e4f15 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -35,15 +35,15 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <klocale.h> #include <kiconview.h> #include <kglobal.h> #include <kiconloader.h> #include <kiconeffect.h> #include <klineedit.h> -#include <ktoolbar.h> -#include <kpopupmenu.h> +#include <tdetoolbar.h> +#include <tdepopupmenu.h> #include <kdialogbase.h> #include <kxmlguiclient.h> #include <kxmlguifactory.h> diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index adf704b1d..d6414cbc1 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -20,7 +20,7 @@ #include <dcopref.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> |