summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-07 20:18:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-07 20:18:15 -0600
commit2b1df858bf24b199a5d3e4fc537df3e9701f8daa (patch)
tree063aef4f1197824f5709be83760d37048d1c6a33
parent5f9c25a4e4c431d488a9951290cc25ae5825432f (diff)
downloadkoffice-2b1df858.tar.gz
koffice-2b1df858.zip
Rename kwin to twin (part 1 of 2)
-rw-r--r--chalk/colorspaces/wet/wet_plugin.cc2
-rw-r--r--chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop2
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop2
-rw-r--r--kdgantt/KDGanttView.cpp26
-rw-r--r--kdgantt/KDGanttView.h8
-rw-r--r--kdgantt/KDGanttViewSubwidgets.cpp10
-rw-r--r--kdgantt/KDGanttViewSubwidgets.h8
-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--koshell/koshell_main.cc2
-rw-r--r--kspread/kspread_toolbox.cc2
-rw-r--r--kugar/kudesigner/kudesigner_doc.cpp2
-rw-r--r--kugar/kudesigner/kudesigner_view.cpp2
-rw-r--r--kword/HACKING6
-rw-r--r--kword/KWInsertPicDia.h4
-rw-r--r--kword/Makefile.am4
-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
-rw-r--r--lib/kotext/kohyphen/hyphdicts/hyph_nl.dic2
30 files changed, 58 insertions, 58 deletions
diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc
index df0666c4..bc85c67f 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 <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqpoint.h>
#include <tqlabel.h>
#include <tqwidget.h>
diff --git a/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
index 70001614..3bc415e3 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
+++ b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
@@ -15,7 +15,7 @@ Name[it]=Strumento di reticolo prospettico
Name[ja]=遠近法グリッドツール
Name[km]=ឧបករណ៍​ក្រឡា​ចត្រង្គ​យថាទស្សន៍
Name[nb]=Perspektivnett-verktøy
-Name[nds]=Kiekwinkelgadder-Warktüüch
+Name[nds]=Kietwinkelgadder-Warktüüch
Name[ne]=दृश्यात्मक ग्रीड उपकरण
Name[nl]=Perspectiefraster-gereedschap
Name[pl]=Narzędzie siatki perspektywy
diff --git a/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
index 860efc69..98914bcf 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
+++ b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
@@ -17,7 +17,7 @@ Name[it]=Strumento di trasformazione della prospettiva
Name[ja]=視点変更ツール
Name[km]=ឧបករណ៍​ប្លែង​យថាទស្សន៍
Name[nb]=Verktøy for perspektivtransformasjon
-Name[nds]=Warktüüch för't Kiekwinkeltopassen
+Name[nds]=Warktüüch för't Kietwinkeltopassen
Name[ne]=दृश्यात्मक रूपान्तरण उपकरण
Name[nl]=Perspectiefrooster-gereedschap
Name[pl]=Narzędzie zmiany perspektywy
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index d9bd17b5..f0c59184 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -613,12 +613,12 @@ void KDGanttView::slotHeaderSizeChanged()
Specifies whether the legend should be shown as a dock window or not.
\param show if true, show legend as a dock window
- \sa showLegend(), legendIsDockwindow(), legendDockwindow()
-*/void KDGanttView::setLegendIsDockwindow( bool show )
+ \sa showLegend(), legendIsDoctwindow(), legendDoctwindow()
+*/void KDGanttView::setLegendIsDoctwindow( bool show )
{
- bool isdock = myLegend->asDockwindow();
+ bool isdock = myLegend->asDoctwindow();
if ( show != isdock ) {
- myLegend->setAsDockwindow(show);
+ myLegend->setAsDoctwindow(show);
// legend is cleared - reinit legend with list
legendItem* li;
for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) {
@@ -632,10 +632,10 @@ void KDGanttView::slotHeaderSizeChanged()
Returns whether the legend is shown as a dock window
\return true if the legend is shown as a dock window
- \sa setShowLegend(), setLegendIsDockwindow(), legendDockwindow()
-*/bool KDGanttView::legendIsDockwindow() const
+ \sa setShowLegend(), setLegendIsDoctwindow(), legendDoctwindow()
+*/bool KDGanttView::legendIsDoctwindow() const
{
- return myLegend->asDockwindow();
+ return myLegend->asDoctwindow();
}
@@ -644,16 +644,16 @@ void KDGanttView::slotHeaderSizeChanged()
DO NOT DELETE THIS POINTER!
If the legend is not a dock window, 0 is returned
To set the legend as a dock window, call
- KDGanttView::setLegendIsDockwindow( true );
+ KDGanttView::setLegendIsDoctwindow( true );
\return the pointer to the legend dock window
0 is returned, if the legend is no dock window
DO NOT DELETE THIS POINTER!
- \sa setShowLegend(), setLegendIsDockwindow(),legendIsDockwindow()
+ \sa setShowLegend(), setLegendIsDoctwindow(),legendIsDoctwindow()
*/
-TQDockWindow* KDGanttView::legendDockwindow() const
+TQDockWindow* KDGanttView::legendDoctwindow() const
{
- return myLegend->dockwindow();
+ return myLegend->doctwindow();
}
@@ -2526,7 +2526,7 @@ bool KDGanttView::loadXML( const TQDomDocument& doc )
} else if( tagName == "LegendIsDockWindow" ) {
bool value;
if( KDGanttXML::readBoolNode( element, value ) )
- setLegendIsDockwindow( value );
+ setLegendIsDoctwindow( value );
} else if( tagName == "ShowListView" ) {
bool value;
if( KDGanttXML::readBoolNode( element, value ) )
@@ -3282,7 +3282,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
// the LegendIsDockWindow element
KDGanttXML::createBoolNode( doc, docRoot, "LegendIsDockWindow",
- legendIsDockwindow() );
+ legendIsDoctwindow() );
// the ShowListView element
KDGanttXML::createBoolNode( doc, docRoot, "ShowListView", showListView() );
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index f736494e..02fdc5d7 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -101,7 +101,7 @@ class KDGanttView : public KDGanttMinimizeSplitter
TQ_PROPERTY( bool showTimeTablePopupMenu READ showTimeTablePopupMenu WRITE setShowTimeTablePopupMenu )
TQ_PROPERTY( bool headerVisible READ headerVisible WRITE setHeaderVisible )
TQ_PROPERTY( bool showLegendButton READ showLegendButton WRITE setShowLegendButton )
- TQ_PROPERTY( bool legendIsDockwindow READ legendIsDockwindow WRITE setLegendIsDockwindow )
+ TQ_PROPERTY( bool legendIsDoctwindow READ legendIsDoctwindow WRITE setLegendIsDoctwindow )
TQ_PROPERTY( bool displayEmptyTasksAsLine READ displayEmptyTasksAsLine WRITE setDisplayEmptyTasksAsLine )
TQ_PROPERTY( TQBrush noInformationBrush READ noInformationBrush WRITE setNoInformationBrush )
TQ_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled )
@@ -131,9 +131,9 @@ public:
int ganttMaximumWidth() const;
void setShowLegend( bool show );
bool showLegend() const;
- void setLegendIsDockwindow( bool dock );
- bool legendIsDockwindow( ) const;
- TQDockWindow* legendDockwindow( ) const;
+ void setLegendIsDoctwindow( bool dock );
+ bool legendIsDoctwindow( ) const;
+ TQDockWindow* legendDoctwindow( ) const;
void setShowListView( bool show );
bool showListView() const;
void setEditorEnabled( bool enable );
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 8acf172b..bb41746f 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -2565,11 +2565,11 @@ KDLegendWidget:: KDLegendWidget( TQWidget* parent,
clearLegend();
showMe ( false );
}
-void KDLegendWidget::setAsDockwindow( bool dockwin )
+void KDLegendWidget::setAsDoctwindow( bool doctwin )
{
- if ( (dock == 0 && !dockwin) || ( dock && dockwin ) )
+ if ( (dock == 0 && !doctwin) || ( dock && doctwin ) )
return;
- if ( dockwin )
+ if ( doctwin )
{
setMaximizedWidget( 0 );
showMe ( false );
@@ -2606,7 +2606,7 @@ void KDLegendWidget::setAsDockwindow( bool dockwin )
}
-bool KDLegendWidget::asDockwindow( )
+bool KDLegendWidget::asDoctwindow( )
{
if ( dock )
return true;
@@ -2614,7 +2614,7 @@ bool KDLegendWidget::asDockwindow( )
}
-TQDockWindow* KDLegendWidget::dockwindow( )
+TQDockWindow* KDLegendWidget::doctwindow( )
{
return dock;
}
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index bad3c16b..4db6c950 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -53,7 +53,7 @@
#include <tqlabel.h>
#include <tqbrush.h>
#include <tqvbox.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqtimer.h>
#include "KDGanttView.h"
@@ -335,9 +335,9 @@ public:
void clearLegend();
void setFont( TQFont );
void drawToPainter( TQPainter *p );
- void setAsDockwindow( bool dockwin );
- bool asDockwindow();
- TQDockWindow* dockwindow();
+ void setAsDoctwindow( bool doctwin );
+ bool asDoctwindow();
+ TQDockWindow* doctwindow();
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 7166e7cc..f95ceeca 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 <tqdockwindow.h>
+#include <tqdoctwindow.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 f309283f..7ea4172f 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 <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqhbox.h>
#include <tqpainter.h>
#include <tqevent.h>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 37ff1c83..a888e8ac 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 <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqdockarea.h>
#include <kapplication.h>
diff --git a/kivio/kiviopart/kivio_stackbar.h b/kivio/kiviopart/kivio_stackbar.h
index 452956ff..6a01775c 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 <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqptrdict.h>
namespace Kivio {
diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc
index ac57a7cb..b4c84ad7 100644
--- a/koshell/koshell_main.cc
+++ b/koshell/koshell_main.cc
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kuniqueapplication.h>
-#include <kwin.h>
+#include <twin.h>
#include <KoGlobal.h>
diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc
index 4a3ed94a..06e7a689 100644
--- a/kspread/kspread_toolbox.cc
+++ b/kspread/kspread_toolbox.cc
@@ -20,7 +20,7 @@
#include "kspread_toolbox.h"
#include "KoDocumentChild.h"
-#include <kwin.h>
+#include <twin.h>
#include <tqlayout.h>
#include <tqspinbox.h>
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index 0e7355b2..de46daa1 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 <tqdockwindow.h>
+#include <tqdoctwindow.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 991d8304..67fdc12c 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 <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqmenubar.h>
#include <tqmessagebox.h>
#include <tqspinbox.h>
diff --git a/kword/HACKING b/kword/HACKING
index 6d39a085..c808ac27 100644
--- a/kword/HACKING
+++ b/kword/HACKING
@@ -136,8 +136,8 @@ FILES:
kwoasissaver.h/cc - OASIS saving of a document fragment (paragraphs)
advanced editing:
- kwinserthorizontallinedia.h/cc - insert hor. line dialog
- kwinsertpagedia.h/cc - insert page dialog
+ twinserthorizontallinedia.h/cc - insert hor. line dialog
+ twinsertpagedia.h/cc - insert page dialog
tables:
kwtableframeset.h/cc - all the table handling
kwtabletemplate.h/cc - holds table templates
@@ -170,7 +170,7 @@ FILES:
- (inline image without frame)
- (not available from the UI,
- only from old files)
- kwinsertpicdia.h/cc - insert picture dialog
+ twinsertpicdia.h/cc - insert picture dialog
core features:
variables:
diff --git a/kword/KWInsertPicDia.h b/kword/KWInsertPicDia.h
index 1c151b2a..fdeedc42 100644
--- a/kword/KWInsertPicDia.h
+++ b/kword/KWInsertPicDia.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef kwinsertpicdia_h
-#define kwinsertpicdia_h
+#ifndef twinsertpicdia_h
+#define twinsertpicdia_h
#include <kdialogbase.h>
class TQCheckBox;
diff --git a/kword/Makefile.am b/kword/Makefile.am
index e85a214c..523c2d91 100644
--- a/kword/Makefile.am
+++ b/kword/Makefile.am
@@ -63,8 +63,8 @@ METASOURCES = AUTO
libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel
libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore
libkwmailmerge_interface_la_LIBADD = $(LIB_QT) -lDCOP
-kwincludedir = $(includedir)/kword
-kwinclude_HEADERS = KWMailMergeDataSource.h
+twincludedir = $(includedir)/kword
+twinclude_HEADERS = KWMailMergeDataSource.h
kwmailmerge_servicetype_DATA=kwmailmerge.desktop
kwmailmerge_servicetypedir=$(kde_servicetypesdir)
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 9535c14a..67f4c49b 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -19,7 +19,7 @@
// TQt includes
#include <tqsplitter.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.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 dockwindow currently being sized. If 0, sizing is not in progress.
+ // The splitter or doctwindow 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 889e006d..5f696fc8 100644
--- a/lib/kofficeui/KoContextCelp.h
+++ b/lib/kofficeui/KoContextCelp.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tqbitmap.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <kaction.h>
#include <koffice_export.h>
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index db4d6467..d6af0e97 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 <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <kdebug.h>
#include <kparts/event.h>
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index c9d6cb2b..415d8394 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -16,7 +16,7 @@
*/
#include <tqwidget.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqvariant.h>
#include <tqlabel.h>
#include <tqtoolbutton.h>
diff --git a/lib/kopalette/kopalette.h b/lib/kopalette/kopalette.h
index 48d9cb3c..0b668008 100644
--- a/lib/kopalette/kopalette.h
+++ b/lib/kopalette/kopalette.h
@@ -18,7 +18,7 @@
#ifndef _KO_PALETTE_
#define _KO_PALETTE_
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqwidget.h>
#include <tqlabel.h>
#include <tqtoolbutton.h>
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index 94ea8d4d..d27c05fc 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -17,7 +17,7 @@
#include <tqapplication.h>
#include <tqdockarea.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqdict.h>
#include <tqwidget.h>
#include <tqobject.h>
diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h
index be9e7126..fe2d6ec1 100644
--- a/lib/kopalette/kopalettemanager.h
+++ b/lib/kopalette/kopalettemanager.h
@@ -19,7 +19,7 @@
#define _KO_PALETTE_MANAGER_
#include <tqobject.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqstring.h>
#include <tqmap.h>
#include <tqdict.h>
@@ -61,7 +61,7 @@ namespace {
}
/**
- * Manages the set of dockwindow palettes and their widgets.
+ * Manages the set of doctwindow 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 0e798842..7730b5f9 100644
--- a/lib/kopalette/kotabpalette.cc
+++ b/lib/kopalette/kotabpalette.cc
@@ -16,7 +16,7 @@
*/
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <ktabwidget.h>
#include <kdebug.h>
diff --git a/lib/kopalette/kotabpalette.h b/lib/kopalette/kotabpalette.h
index a33d58a2..5a18c551 100644
--- a/lib/kopalette/kotabpalette.h
+++ b/lib/kopalette/kotabpalette.h
@@ -18,7 +18,7 @@
#ifndef _KO_TAB_PALETTE_
#define _KO_TAB_PALETTE_
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <ktabwidget.h>
#include "kopalette.h"
diff --git a/lib/kopalette/kotoolboxpalette.cc b/lib/kopalette/kotoolboxpalette.cc
index e4c2bd63..0f0166c2 100644
--- a/lib/kopalette/kotoolboxpalette.cc
+++ b/lib/kopalette/kotoolboxpalette.cc
@@ -17,7 +17,7 @@
*/
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqtoolbox.h>
#include <kopalette.h>
diff --git a/lib/kopalette/kotoolboxpalette.h b/lib/kopalette/kotoolboxpalette.h
index 1d15ef62..56da2ad5 100644
--- a/lib/kopalette/kotoolboxpalette.h
+++ b/lib/kopalette/kotoolboxpalette.h
@@ -18,7 +18,7 @@
#ifndef _KO_TOOLBOX_PALETTE_
#define _KO_TOOLBOX_PALETTE_
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqtoolbox.h>
#include <kopalettemanager.h>
diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic b/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic
index 0a5b745b..6375bb55 100644
--- a/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic
+++ b/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic
@@ -5895,7 +5895,7 @@ k2wie
k3wijz
k4wik
2kwil
-2kwin
+2twin
k3wind
4k1wo
ky3