summaryrefslogtreecommitdiffstats
path: root/tdeui/tdetoolbarbutton.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/tdetoolbarbutton.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/tdetoolbarbutton.cpp')
-rw-r--r--tdeui/tdetoolbarbutton.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index 49ceb57fa..0320e963a 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -24,8 +24,8 @@
#include <config.h>
#include <string.h>
-#include "ktoolbarbutton.h"
-#include "ktoolbar.h"
+#include "tdetoolbarbutton.h"
+#include "tdetoolbar.h"
#include <tqstyle.h>
#include <tqimage.h>
@@ -46,7 +46,7 @@
#include <kiconloader.h>
// needed to get our instance
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
template class TQIntDict<TDEToolBarButton>;
@@ -778,4 +778,4 @@ TDEToolBarButtonList::TDEToolBarButtonList()
void TDEToolBarButton::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
-#include "ktoolbarbutton.moc"
+#include "tdetoolbarbutton.moc"