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 /karm/tray.cpp | |
| 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 'karm/tray.cpp')
| -rw-r--r-- | karm/tray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/karm/tray.cpp b/karm/tray.cpp index 2933b8ae8..06d08af26 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -16,12 +16,12 @@ #include <tqtimer.h> #include <tqtooltip.h> -#include <kaction.h> // actionPreferences() +#include <tdeaction.h> // actionPreferences() #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> // UserIcon #include <klocale.h> // i18n -#include <kpopupmenu.h> // plug() +#include <tdepopupmenu.h> // plug() #include <ksystemtray.h> #include "mainwindow.h" |