diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:55 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:55 -0600 |
commit | d318087925a540a204c9d3820d5a09fbda58b8b2 (patch) | |
tree | b8dde6aa5d6559b81c6667d8364a4364c27bcba4 /kmobile | |
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 'kmobile')
-rw-r--r-- | kmobile/kmobile.cpp | 6 | ||||
-rw-r--r-- | kmobile/kmobile.h | 2 | ||||
-rw-r--r-- | kmobile/systemtray.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 3d867b3d7..5e8ac37c1 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -28,7 +28,7 @@ #include <kmenubar.h> #include <kstatusbar.h> #include <kkeydialog.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> #include <kmessagebox.h> @@ -36,8 +36,8 @@ #include <kedittoolbar.h> -#include <kstdaccel.h> -#include <kaction.h> +#include <tdestdaccel.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kpushbutton.h> diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h index a91c4cce3..f2d6d613f 100644 --- a/kmobile/kmobile.h +++ b/kmobile/kmobile.h @@ -6,7 +6,7 @@ #define _KMOBILE_H_ #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <ktrader.h> #include "kmobileview.h" diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index b18faa976..a7cef5b8e 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -17,10 +17,10 @@ */ #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpassivepopup.h> -#include <kaction.h> -#include <kmainwindow.h> +#include <tdeaction.h> +#include <tdemainwindow.h> #include <kiconeffect.h> #include <kdebug.h> |