diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:07 -0600 |
| commit | e46eba349e7029d919b213b7130086503d1e042e (patch) | |
| tree | c99ad6970d22aa80d905a7129d87aa627ae26801 /kbabel/kbabel | |
| parent | df726f3e9706e8264827dc1dc8338225c3b6434f (diff) | |
| download | tdesdk-e46eba349e7029d919b213b7130086503d1e042e.tar.gz tdesdk-e46eba349e7029d919b213b7130086503d1e042e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/kbabel')
| -rw-r--r-- | kbabel/kbabel/kbabel.cpp | 8 | ||||
| -rw-r--r-- | kbabel/kbabel/kbabelview.cpp | 4 | ||||
| -rw-r--r-- | kbabel/kbabel/kbcataloglistview.cpp | 2 | ||||
| -rw-r--r-- | kbabel/kbabel/kbcataloglistviewitem.h | 2 | ||||
| -rw-r--r-- | kbabel/kbabel/mymultilineedit.cpp | 2 | ||||
| -rw-r--r-- | kbabel/kbabel/taglistview.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index eea5f60b..9be4ec13 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -60,15 +60,15 @@ #include <dcopclient.h> #include <kdatatool.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstatusbar.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kedittoolbar.h> #include <kglobal.h> #include <kled.h> #include <klocale.h> #include <kiconloader.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <tdefiledialog.h> #include <tdeconfig.h> #include <kurl.h> @@ -77,7 +77,7 @@ #include <kpushbutton.h> #include <kmessagebox.h> #include <twin.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tdespelldlg.h> #include <ksqueezedtextlabel.h> diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 5755a3e3..49247256 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -69,13 +69,13 @@ #include <tdeconfig.h> #include <kapplication.h> #include <kled.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <tdeio/netaccess.h> #include <knotifyclient.h> #include <ktempfile.h> #include <tdespell.h> #include <twin.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kurldrag.h> #include <kglobalsettings.h> diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index d05f135c..9b7d7538 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -27,7 +27,7 @@ #include "editcmd.h" #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqcolor.h> #include <tqlayout.h> #include <kglobalsettings.h> diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h index 89c0e859..6384360f 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.h +++ b/kbabel/kbabel/kbcataloglistviewitem.h @@ -23,7 +23,7 @@ #ifndef KBCATALOGLISTVIEWITEM_H #define KBCATALOGLISTVIEWITEM_H #include <memory> -#include <klistview.h> +#include <tdelistview.h> #include <tqsimplerichtext.h> #include "mymultilineedit.h" diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 6edcbbc5..1e75f78b 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -56,7 +56,7 @@ #include <kglobal.h> #include <kglobalsettings.h> #include <kmessagebox.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include "kbhighlighting.h" diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 0fdd8183..d1adb648 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -37,7 +37,7 @@ #include <tqwhatsthis.h> #include <kcursor.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include "kbcatalog.h" |