diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /lib/kofficeui/KoToolBox.cpp | |
parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui/KoToolBox.cpp')
-rw-r--r-- | lib/kofficeui/KoToolBox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index db4d6467c..ba3c3a9be 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -44,7 +44,7 @@ #include <config.h> #endif -KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, KInstance* instance, int numberOfTooltypes ) +KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes ) : KToolBar( mainWin, TQt::DockLeft, false, name, true, true), m_instance(instance) { setFullSize( false ); |