diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:04 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:04 -0600 |
commit | d1e0cc99a202cef3306b90b8839a6726e89f201e (patch) | |
tree | a0d01a91644fd94aa6da5d8944e052b67461faad /tdeparts | |
parent | 3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff) | |
download | tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeparts')
-rw-r--r-- | tdeparts/dockmainwindow.cpp (renamed from tdeparts/doctdemainwindow.cpp) | 2 | ||||
-rw-r--r-- | tdeparts/dockmainwindow.h (renamed from tdeparts/doctdemainwindow.h) | 2 | ||||
-rw-r--r-- | tdeparts/mainwindow.cpp | 2 | ||||
-rw-r--r-- | tdeparts/mainwindow.h | 4 | ||||
-rw-r--r-- | tdeparts/plugin.h | 2 | ||||
-rw-r--r-- | tdeparts/statusbarextension.cpp | 2 | ||||
-rw-r--r-- | tdeparts/tests/example.cpp | 2 | ||||
-rw-r--r-- | tdeparts/tests/ghostview.cpp | 2 | ||||
-rw-r--r-- | tdeparts/tests/normalktm.cpp | 2 | ||||
-rw-r--r-- | tdeparts/tests/normalktm.h | 2 | ||||
-rw-r--r-- | tdeparts/tests/notepad.cpp | 2 | ||||
-rw-r--r-- | tdeparts/tests/parts.cpp | 2 | ||||
-rw-r--r-- | tdeparts/tests/plugin_spellcheck.cpp | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/tdeparts/doctdemainwindow.cpp b/tdeparts/dockmainwindow.cpp index ce462e691..9c8d72112 100644 --- a/tdeparts/doctdemainwindow.cpp +++ b/tdeparts/dockmainwindow.cpp @@ -22,7 +22,7 @@ #include <tdeparts/dockmainwindow.h> #include <tdeparts/event.h> #include <tdeparts/part.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeparts/plugin.h> #include <kstatusbar.h> #include <kinstance.h> diff --git a/tdeparts/doctdemainwindow.h b/tdeparts/dockmainwindow.h index 223bd3a42..5f9209092 100644 --- a/tdeparts/doctdemainwindow.h +++ b/tdeparts/dockmainwindow.h @@ -22,7 +22,7 @@ #define __DOCKMAINWINDOW_H #include <tqptrlist.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdockwidget.h> diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp index 5f0a31a91..b3245da9b 100644 --- a/tdeparts/mainwindow.cpp +++ b/tdeparts/mainwindow.cpp @@ -29,7 +29,7 @@ #include <tqapplication.h> #include <kxmlguifactory.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kdebug.h> #include <assert.h> diff --git a/tdeparts/mainwindow.h b/tdeparts/mainwindow.h index 4619a72cc..5872ae9c2 100644 --- a/tdeparts/mainwindow.h +++ b/tdeparts/mainwindow.h @@ -21,9 +21,9 @@ #define __MAINWINDOW_H #include <tqptrlist.h> -#include <kaction.h> +#include <tdeaction.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdeparts/part.h> diff --git a/tdeparts/plugin.h b/tdeparts/plugin.h index df1200ee9..751ee9c99 100644 --- a/tdeparts/plugin.h +++ b/tdeparts/plugin.h @@ -21,7 +21,7 @@ #define PLUGIN_H #include <tqobject.h> -#include <kaction.h> +#include <tdeaction.h> #include <kxmlguiclient.h> class TDEInstance; diff --git a/tdeparts/statusbarextension.cpp b/tdeparts/statusbarextension.cpp index f0c7204ae..3803efa95 100644 --- a/tdeparts/statusbarextension.cpp +++ b/tdeparts/statusbarextension.cpp @@ -24,7 +24,7 @@ #include <tqobjectlist.h> #include <kstatusbar.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kdebug.h> #include <tdelibs_export.h> #include <tdeparts/part.h> diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp index 34a96a334..0571bf4ad 100644 --- a/tdeparts/tests/example.cpp +++ b/tdeparts/tests/example.cpp @@ -11,7 +11,7 @@ #include <kstandarddirs.h> #include <kapplication.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> Shell::Shell() diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp index c365bcfcb..66d6f786a 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -1,7 +1,7 @@ #include <kiconloader.h> #include <kstandarddirs.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp index b3907402e..14efbef94 100644 --- a/tdeparts/tests/normalktm.cpp +++ b/tdeparts/tests/normalktm.cpp @@ -11,7 +11,7 @@ #include <kstandarddirs.h> #include <kapplication.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kmenubar.h> diff --git a/tdeparts/tests/normalktm.h b/tdeparts/tests/normalktm.h index 7183690f0..f60d490a6 100644 --- a/tdeparts/tests/normalktm.h +++ b/tdeparts/tests/normalktm.h @@ -3,7 +3,7 @@ #define __normalktm_h__ #include <tdeparts/part.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class TDEAction; class TQWidget; diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp index f2b43ccda..547cab520 100644 --- a/tdeparts/tests/notepad.cpp +++ b/tdeparts/tests/notepad.cpp @@ -11,7 +11,7 @@ #include <kaboutdata.h> #include <kapplication.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kstatusbar.h> #include <kstandarddirs.h> diff --git a/tdeparts/tests/parts.cpp b/tdeparts/tests/parts.cpp index f41063ef9..e765f55e7 100644 --- a/tdeparts/tests/parts.cpp +++ b/tdeparts/tests/parts.cpp @@ -15,7 +15,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> Part1::Part1( TQObject *parent, TQWidget * parentWidget ) diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp index dcdf33312..73d5b7986 100644 --- a/tdeparts/tests/plugin_spellcheck.cpp +++ b/tdeparts/tests/plugin_spellcheck.cpp @@ -1,7 +1,7 @@ #include "notepad.h" // this plugin applies to a notepad part #include <tqmultilineedit.h> #include "plugin_spellcheck.h" -#include <kaction.h> +#include <tdeaction.h> #include <kgenericfactory.h> #include <kmessagebox.h> #include <klocale.h> |