summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-08 00:05:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-08 00:05:53 -0600
commitde123eb5e3e3b2561b5836332456b4320ee3daf3 (patch)
tree231b2c8fd8bf4a93ad120de89704d0c774f058f7
parent2b1df858bf24b199a5d3e4fc537df3e9701f8daa (diff)
downloadkoffice-de123eb5e3e3b2561b5836332456b4320ee3daf3.tar.gz
koffice-de123eb5e3e3b2561b5836332456b4320ee3daf3.zip
Fix accidental conversion of dockwin
-rw-r--r--chalk/colorspaces/wet/wet_plugin.cc2
-rw-r--r--kdgantt/KDGanttView.cpp2
-rw-r--r--kdgantt/KDGanttViewSubwidgets.cpp8
-rw-r--r--kdgantt/KDGanttViewSubwidgets.h6
-rw-r--r--kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp2
-rw-r--r--kexi/formeditor/test/kfd_part.cpp2
-rw-r--r--kexi/main/keximainwindowimpl.cpp2
-rw-r--r--kivio/kiviopart/kivio_stackbar.h2
-rw-r--r--kugar/kudesigner/kudesigner_doc.cpp2
-rw-r--r--kugar/kudesigner/kudesigner_view.cpp2
-rw-r--r--lib/kofficecore/kkbdaccessextensions.cpp4
-rw-r--r--lib/kofficeui/KoContextCelp.h2
-rw-r--r--lib/kofficeui/KoToolBox.cpp2
-rw-r--r--lib/kopalette/kopalette.cc2
-rw-r--r--lib/kopalette/kopalette.h2
-rw-r--r--lib/kopalette/kopalettemanager.cc2
-rw-r--r--lib/kopalette/kopalettemanager.h4
-rw-r--r--lib/kopalette/kotabpalette.cc2
-rw-r--r--lib/kopalette/kotabpalette.h2
-rw-r--r--lib/kopalette/kotoolboxpalette.cc2
-rw-r--r--lib/kopalette/kotoolboxpalette.h2
21 files changed, 28 insertions, 28 deletions
diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc
index bc85c67f..df0666c4 100644
--- a/chalk/colorspaces/wet/wet_plugin.cc
+++ b/chalk/colorspaces/wet/wet_plugin.cc
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <tqapplication.h>
#include <tqclipboard.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqpoint.h>
#include <tqlabel.h>
#include <tqwidget.h>
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index f0c59184..f14ac027 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -653,7 +653,7 @@ void KDGanttView::slotHeaderSizeChanged()
*/
TQDockWindow* KDGanttView::legendDoctwindow() const
{
- return myLegend->doctwindow();
+ return myLegend->dockwindow();
}
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index bb41746f..d158c75a 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -2565,11 +2565,11 @@ KDLegendWidget:: KDLegendWidget( TQWidget* parent,
clearLegend();
showMe ( false );
}
-void KDLegendWidget::setAsDoctwindow( bool doctwin )
+void KDLegendWidget::setAsDoctwindow( bool dockwin )
{
- if ( (dock == 0 && !doctwin) || ( dock && doctwin ) )
+ if ( (dock == 0 && !dockwin) || ( dock && dockwin ) )
return;
- if ( doctwin )
+ if ( dockwin )
{
setMaximizedWidget( 0 );
showMe ( false );
@@ -2614,7 +2614,7 @@ bool KDLegendWidget::asDoctwindow( )
}
-TQDockWindow* KDLegendWidget::doctwindow( )
+TQDockWindow* KDLegendWidget::dockwindow( )
{
return dock;
}
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 4db6c950..8b7bc215 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -53,7 +53,7 @@
#include <tqlabel.h>
#include <tqbrush.h>
#include <tqvbox.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqtimer.h>
#include "KDGanttView.h"
@@ -335,9 +335,9 @@ public:
void clearLegend();
void setFont( TQFont );
void drawToPainter( TQPainter *p );
- void setAsDoctwindow( bool doctwin );
+ void setAsDoctwindow( bool dockwin );
bool asDoctwindow();
- TQDockWindow* doctwindow();
+ TQDockWindow* dockwindow();
TQSize legendSize();
TQSize legendSizeHint();
private:
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
index f95ceeca..7166e7cc 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
@@ -19,7 +19,7 @@
#include <tqworkspace.h>
#include <tqdockarea.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqhbox.h>
#include <tqpainter.h>
#include <tqevent.h>
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 7ea4172f..f309283f 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -19,7 +19,7 @@
#include <tqworkspace.h>
#include <tqdockarea.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqhbox.h>
#include <tqpainter.h>
#include <tqevent.h>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index a888e8ac..37ff1c83 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -33,7 +33,7 @@
#include <tqmutex.h>
#include <tqwaitcondition.h>
#include <tqfiledialog.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqdockarea.h>
#include <kapplication.h>
diff --git a/kivio/kiviopart/kivio_stackbar.h b/kivio/kiviopart/kivio_stackbar.h
index 6a01775c..452956ff 100644
--- a/kivio/kiviopart/kivio_stackbar.h
+++ b/kivio/kiviopart/kivio_stackbar.h
@@ -19,7 +19,7 @@
#ifndef KIVIO_STACK_BAR_H
#define KIVIO_STACK_BAR_H
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqptrdict.h>
namespace Kivio {
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index de46daa1..0e7355b2 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -31,7 +31,7 @@
#include <tqprinter.h>
#include <tqpaintdevicemetrics.h>
#include <tqfileinfo.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqdom.h>
#include <tqtextstream.h>
#include <tqtextcodec.h>
diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp
index 67fdc12c..991d8304 100644
--- a/kugar/kudesigner/kudesigner_view.cpp
+++ b/kugar/kudesigner/kudesigner_view.cpp
@@ -29,7 +29,7 @@
#include <tqmainwindow.h>
#include <tqaction.h>
#include <tqlayout.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqmenubar.h>
#include <tqmessagebox.h>
#include <tqspinbox.h>
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 67f4c49b..9535c14a 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -19,7 +19,7 @@
// TQt includes
#include <tqsplitter.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqdockarea.h>
#include <tqevent.h>
#include <tqcursor.h>
@@ -136,7 +136,7 @@ class KKbdAccessExtensionsPrivate
// Action that starts access keys.
KAction* accessKeysAction;
- // The splitter or doctwindow currently being sized. If 0, sizing is not in progress.
+ // The splitter or dockwindow currently being sized. If 0, sizing is not in progress.
TQWidget* panel;
// Index of current handle of the panel. When panel is a TQDockWindow:
diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h
index 5f696fc8..889e006d 100644
--- a/lib/kofficeui/KoContextCelp.h
+++ b/lib/kofficeui/KoContextCelp.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tqbitmap.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <kaction.h>
#include <koffice_export.h>
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index d6af0e97..db4d6467 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqtoolbar.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <kdebug.h>
#include <kparts/event.h>
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index 415d8394..c9d6cb2b 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -16,7 +16,7 @@
*/
#include <tqwidget.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqvariant.h>
#include <tqlabel.h>
#include <tqtoolbutton.h>
diff --git a/lib/kopalette/kopalette.h b/lib/kopalette/kopalette.h
index 0b668008..48d9cb3c 100644
--- a/lib/kopalette/kopalette.h
+++ b/lib/kopalette/kopalette.h
@@ -18,7 +18,7 @@
#ifndef _KO_PALETTE_
#define _KO_PALETTE_
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqwidget.h>
#include <tqlabel.h>
#include <tqtoolbutton.h>
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index d27c05fc..94ea8d4d 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -17,7 +17,7 @@
#include <tqapplication.h>
#include <tqdockarea.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqdict.h>
#include <tqwidget.h>
#include <tqobject.h>
diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h
index fe2d6ec1..be9e7126 100644
--- a/lib/kopalette/kopalettemanager.h
+++ b/lib/kopalette/kopalettemanager.h
@@ -19,7 +19,7 @@
#define _KO_PALETTE_MANAGER_
#include <tqobject.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqstring.h>
#include <tqmap.h>
#include <tqdict.h>
@@ -61,7 +61,7 @@ namespace {
}
/**
- * Manages the set of doctwindow palettes and their widgets.
+ * Manages the set of dockwindow palettes and their widgets.
*
* You create one palette manager per view; then you can add widgets
* to your hearts content. Widgets are grouped into dock windows by
diff --git a/lib/kopalette/kotabpalette.cc b/lib/kopalette/kotabpalette.cc
index 7730b5f9..0e798842 100644
--- a/lib/kopalette/kotabpalette.cc
+++ b/lib/kopalette/kotabpalette.cc
@@ -16,7 +16,7 @@
*/
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <ktabwidget.h>
#include <kdebug.h>
diff --git a/lib/kopalette/kotabpalette.h b/lib/kopalette/kotabpalette.h
index 5a18c551..a33d58a2 100644
--- a/lib/kopalette/kotabpalette.h
+++ b/lib/kopalette/kotabpalette.h
@@ -18,7 +18,7 @@
#ifndef _KO_TAB_PALETTE_
#define _KO_TAB_PALETTE_
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <ktabwidget.h>
#include "kopalette.h"
diff --git a/lib/kopalette/kotoolboxpalette.cc b/lib/kopalette/kotoolboxpalette.cc
index 0f0166c2..e4c2bd63 100644
--- a/lib/kopalette/kotoolboxpalette.cc
+++ b/lib/kopalette/kotoolboxpalette.cc
@@ -17,7 +17,7 @@
*/
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqtoolbox.h>
#include <kopalette.h>
diff --git a/lib/kopalette/kotoolboxpalette.h b/lib/kopalette/kotoolboxpalette.h
index 56da2ad5..1d15ef62 100644
--- a/lib/kopalette/kotoolboxpalette.h
+++ b/lib/kopalette/kotoolboxpalette.h
@@ -18,7 +18,7 @@
#ifndef _KO_TOOLBOX_PALETTE_
#define _KO_TOOLBOX_PALETTE_
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
#include <tqtoolbox.h>
#include <kopalettemanager.h>