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 /tderesources/kolab | |
| 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 'tderesources/kolab')
| -rw-r--r-- | tderesources/kolab/kabc/resourcekolab.cpp | 2 | ||||
| -rw-r--r-- | tderesources/kolab/kcal/resourcekolab.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp index 51c3a4b42..889c4811b 100644 --- a/tderesources/kolab/kabc/resourcekolab.cpp +++ b/tderesources/kolab/kabc/resourcekolab.cpp @@ -41,7 +41,7 @@ #include <tdeio/observer.h> #include <tdeio/uiserver_stub.h> #include <kabc/vcardconverter.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kapplication.h> #include <dcopclient.h> diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 50f8b5b82..bfcb3c89f 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -43,7 +43,7 @@ #include <dcopclient.h> #include <libtdepim/kincidencechooser.h> #include <kabc/locknull.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <kinputdialog.h> #include <ktempfile.h> |