summaryrefslogtreecommitdiffstats
path: root/tdeui/tdetoolbar.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:21:04 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /tdeui/tdetoolbar.cpp
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/tdetoolbar.cpp')
-rw-r--r--tdeui/tdetoolbar.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 71d182275..c6049e658 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -42,25 +42,25 @@
#include <tqstyle.h>
#include <tqlayout.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
#include <klineedit.h>
#include <kseparator.h>
#include <klocale.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kanimwidget.h>
#include <kedittoolbar.h>
#include <kipc.h>
#include <twin.h>
#include <kdebug.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
enum {
CONTEXT_TOP = 0,
@@ -2260,5 +2260,5 @@ void TDEToolBar::removeWidgetInternal( TQWidget * w )
void TDEToolBar::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
-#include "ktoolbar.moc"
+#include "tdetoolbar.moc"