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 /kitchensync | |
| 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 'kitchensync')
| -rw-r--r-- | kitchensync/src/mainwidget.cpp | 4 | ||||
| -rw-r--r-- | kitchensync/src/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | kitchensync/src/mainwindow.h | 2 | ||||
| -rw-r--r-- | kitchensync/src/part.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 40a80e62f..f400de142 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -29,10 +29,10 @@ #include <libqopensync/environment.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kstdaction.h> diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp index e67261277..5df9fe219 100644 --- a/kitchensync/src/mainwindow.cpp +++ b/kitchensync/src/mainwindow.cpp @@ -18,10 +18,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kstdaction.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include "mainwidget.h" diff --git a/kitchensync/src/mainwindow.h b/kitchensync/src/mainwindow.h index 4453878b5..d3a0bb6e8 100644 --- a/kitchensync/src/mainwindow.h +++ b/kitchensync/src/mainwindow.h @@ -21,7 +21,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class MainWidget; diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index 0c015e107..dfe7327f6 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqvbox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> |