diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:47 -0600 |
| commit | da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch) | |
| tree | b42ba87fcdfa425a31e243a62d71e1de248b6ee8 /kdict | |
| parent | 4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff) | |
| download | tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kdict')
| -rw-r--r-- | kdict/actions.cpp | 2 | ||||
| -rw-r--r-- | kdict/actions.h | 2 | ||||
| -rw-r--r-- | kdict/matchview.cpp | 2 | ||||
| -rw-r--r-- | kdict/options.cpp | 2 | ||||
| -rw-r--r-- | kdict/queryview.cpp | 2 | ||||
| -rw-r--r-- | kdict/toplevel.cpp | 2 | ||||
| -rw-r--r-- | kdict/toplevel.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/kdict/actions.cpp b/kdict/actions.cpp index 9587d9cc..b2ad29e4 100644 --- a/kdict/actions.cpp +++ b/kdict/actions.cpp @@ -21,7 +21,7 @@ #include <tqpushbutton.h> #include <kcombobox.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name, diff --git a/kdict/actions.h b/kdict/actions.h index 6963acdd..a5dd9201 100644 --- a/kdict/actions.h +++ b/kdict/actions.h @@ -20,7 +20,7 @@ #include <tqguardedptr.h> #include <tqptrlist.h> -#include <kaction.h> +#include <tdeaction.h> #include <kglobalsettings.h> class KComboBox; diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index 1502c8fe..56553af6 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -21,7 +21,7 @@ #include <tqpainter.h> #include <tqregexp.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kapplication.h> #include <kiconloader.h> diff --git a/kdict/options.cpp b/kdict/options.cpp index 05b9e0fd..e3ea91cc 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -33,7 +33,7 @@ #include <knuminput.h> #include <klineedit.h> #include <kcharsets.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kiconloader.h> #include "options.h" diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 0aa6f1b8..5b85a034 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -22,7 +22,7 @@ #include <ktempfile.h> #include <tdeio/netaccess.h> #include <kcursor.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <klocale.h> #include <tdehtml_events.h> diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 6c67fd7c..eb317a4a 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -16,7 +16,7 @@ #include <tqclipboard.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kstdaction.h> #include <kapplication.h> #include <kstatusbar.h> diff --git a/kdict/toplevel.h b/kdict/toplevel.h index f6ecb6a9..82db7591 100644 --- a/kdict/toplevel.h +++ b/kdict/toplevel.h @@ -18,7 +18,7 @@ #define _TOPLEVEL_H_ #include <tqtimer.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "dcopinterface.h" class TQSplitter; |