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 /korganizer/korgac | |
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 'korganizer/korgac')
-rw-r--r-- | korganizer/korgac/alarmdialog.cpp | 2 | ||||
-rw-r--r-- | korganizer/korgac/alarmdockwindow.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 55de923ac..8b6881260 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -47,7 +47,7 @@ #include <kmessagebox.h> #include <knotifyclient.h> #include <kcombobox.h> -#include <klistview.h> +#include <tdelistview.h> #include <twin.h> #include <klockfile.h> diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index d20d30f9c..6c3e22564 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -34,9 +34,9 @@ #include <kurl.h> #include <kstandarddirs.h> #include <dcopclient.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tqtooltip.h> |