summaryrefslogtreecommitdiffstats
path: root/lib/kofficeui/ttdeaction.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:56 -0600
commitece35c015c54312eb13f583cc247cdd9a4051b4d (patch)
tree2c0599b8705e881f2b53678f48e97ffe4f616d22 /lib/kofficeui/ttdeaction.cpp
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui/ttdeaction.cpp')
-rw-r--r--lib/kofficeui/ttdeaction.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kofficeui/ttdeaction.cpp b/lib/kofficeui/ttdeaction.cpp
index 56c626f8..bfdc6c11 100644
--- a/lib/kofficeui/ttdeaction.cpp
+++ b/lib/kofficeui/ttdeaction.cpp
@@ -17,14 +17,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#include "tkaction.h"
-#include "tktoolbarbutton.h"
+#include "ttdeaction.h"
+#include "ttdetoolbarbutton.h"
#include "tkcombobox.h"
#include <tqlabel.h>
#include <tqlayout.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kiconloader.h>
#define SET_FOR_ALL_CONTAINER(WIDGET_TYPE,METHOD_NAME,VALUE) \
@@ -297,4 +297,4 @@ void TTDESelectAction::setEditText(const TQString& text)
}
#undef SET_FOR_ALL_CONTAINER
-#include "tkaction.moc"
+#include "ttdeaction.moc"