diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:04 -0600 |
| commit | 82cf0f4843a92f656345ded3d32ecc591b9c0655 (patch) | |
| tree | 4555032cdcf21fb881a1011ace2bcf32dccf27c2 | |
| parent | 17e46b49e49684c867d4e37af7bb4080430a3dd3 (diff) | |
| download | knemo-82cf0f4843a92f656345ded3d32ecc591b9c0655.tar.gz knemo-82cf0f4843a92f656345ded3d32ecc591b9c0655.zip | |
Rename many classes and header files to avoid conflicts with KDE4
| -rw-r--r-- | src/knemod/interfaceicon.cpp | 2 | ||||
| -rw-r--r-- | src/knemod/interfacetray.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/knemod/interfaceicon.cpp b/src/knemod/interfaceicon.cpp index 3e8b3dd..8a9c35c 100644 --- a/src/knemod/interfaceicon.cpp +++ b/src/knemod/interfaceicon.cpp @@ -25,7 +25,7 @@ #include <kglobal.h> #include <klocale.h> #include <kprocess.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <knotifyclient.h> diff --git a/src/knemod/interfacetray.cpp b/src/knemod/interfacetray.cpp index e1c2b47..5a24762 100644 --- a/src/knemod/interfacetray.cpp +++ b/src/knemod/interfacetray.cpp @@ -24,11 +24,11 @@ #include <klocale.h> #include <kbugreport.h> #include <kaboutdata.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <kapplication.h> #include <kaboutapplication.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include "interfacetray.h" |