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/korganizer | |
| 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/korganizer')
| -rw-r--r-- | kontact/plugins/korganizer/journalplugin.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/korganizer/kcmkorgsummary.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/korganizer/korganizerplugin.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/korganizer/summarywidget.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/korganizer/todoplugin.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/korganizer/todosummarywidget.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index d75bfe76d..0c0af4a3c 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index acc95d0f2..ab574346d 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -29,7 +29,7 @@ #include <kaboutdata.h> #include <kapplication.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 00ed1e532..7f04a0c7f 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -29,7 +29,7 @@ #include <kapplication.h> #include <kabc/vcardconverter.h> -#include <kaction.h> +#include <tdeaction.h> #include <dcopref.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 416b0a5ad..02e3eb106 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <klocale.h> #include <tdeparts/part.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> #include <libkcal/event.h> diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 5c6ce7e9d..7fbc2a9c3 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <kabc/vcardconverter.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 996ea070f..3089c9876 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <klocale.h> #include <tdeparts/part.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> #include <libkcal/resourcecalendar.h> |