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/kmail | |
| 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/kmail')
| -rw-r--r-- | kontact/plugins/kmail/kcmkmailsummary.cpp | 4 | ||||
| -rw-r--r-- | kontact/plugins/kmail/kmail_plugin.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 3ca4c903..ba05ddd0 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -27,12 +27,12 @@ #include <dcopref.h> #include <kaboutdata.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kapplication.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include "kcmkmailsummary.h" diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 051d69b9..6db41f4c 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -23,7 +23,7 @@ #include <tqwidget.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kgenericfactory.h> |