diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index df0666c4e..bc85c67fc 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop index 70001614f..3bc415e37 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 860efc691..98914bcf9 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 d9bd17b5f..f0c59184d 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 f736494e1..02fdc5d71 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 8acf172b0..bb41746f3 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 bad3c16b1..4db6c9509 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #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 7166e7cc6..f95ceeca2 100644 --- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index f309283f0..7ea4172fa 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 37ff1c83f..a888e8acb 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/kivio/kiviopart/kivio_stackbar.h b/kivio/kiviopart/kivio_stackbar.h index 452956ff2..6a01775c4 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 +#include #include namespace Kivio { diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc index ac57a7cba..b4c84ad79 100644 --- a/koshell/koshell_main.cc +++ b/koshell/koshell_main.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc index 4a3ed94af..06e7a6891 100644 --- a/kspread/kspread_toolbox.cc +++ b/kspread/kspread_toolbox.cc @@ -20,7 +20,7 @@ #include "kspread_toolbox.h" #include "KoDocumentChild.h" -#include +#include #include #include diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp index 0e7355b2f..de46daa1e 100644 --- a/kugar/kudesigner/kudesigner_doc.cpp +++ b/kugar/kudesigner/kudesigner_doc.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index 991d8304d..67fdc12c7 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kword/HACKING b/kword/HACKING index 6d39a0856..c808ac27b 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 1c151b2af..fdeedc425 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 class TQCheckBox; diff --git a/kword/Makefile.am b/kword/Makefile.am index e85a214c7..523c2d915 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 9535c14ac..67f4c49bd 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -19,7 +19,7 @@ // TQt includes #include -#include +#include #include #include #include @@ -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 889e006d3..5f696fc8c 100644 --- a/lib/kofficeui/KoContextCelp.h +++ b/lib/kofficeui/KoContextCelp.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index db4d6467c..d6af0e97c 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index c9d6cb2b0..415d83946 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include #include diff --git a/lib/kopalette/kopalette.h b/lib/kopalette/kopalette.h index 48d9cb3cf..0b6680087 100644 --- a/lib/kopalette/kopalette.h +++ b/lib/kopalette/kopalette.h @@ -18,7 +18,7 @@ #ifndef _KO_PALETTE_ #define _KO_PALETTE_ -#include +#include #include #include #include diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 94ea8d4d7..d27c05fcf 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h index be9e7126a..fe2d6ec14 100644 --- a/lib/kopalette/kopalettemanager.h +++ b/lib/kopalette/kopalettemanager.h @@ -19,7 +19,7 @@ #define _KO_PALETTE_MANAGER_ #include -#include +#include #include #include #include @@ -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 0e7988429..7730b5f97 100644 --- a/lib/kopalette/kotabpalette.cc +++ b/lib/kopalette/kotabpalette.cc @@ -16,7 +16,7 @@ */ -#include +#include #include #include diff --git a/lib/kopalette/kotabpalette.h b/lib/kopalette/kotabpalette.h index a33d58a23..5a18c551e 100644 --- a/lib/kopalette/kotabpalette.h +++ b/lib/kopalette/kotabpalette.h @@ -18,7 +18,7 @@ #ifndef _KO_TAB_PALETTE_ #define _KO_TAB_PALETTE_ -#include +#include #include #include "kopalette.h" diff --git a/lib/kopalette/kotoolboxpalette.cc b/lib/kopalette/kotoolboxpalette.cc index e4c2bd630..0f0166c2b 100644 --- a/lib/kopalette/kotoolboxpalette.cc +++ b/lib/kopalette/kotoolboxpalette.cc @@ -17,7 +17,7 @@ */ -#include +#include #include #include diff --git a/lib/kopalette/kotoolboxpalette.h b/lib/kopalette/kotoolboxpalette.h index 1d15ef622..56da2ad53 100644 --- a/lib/kopalette/kotoolboxpalette.h +++ b/lib/kopalette/kotoolboxpalette.h @@ -18,7 +18,7 @@ #ifndef _KO_TOOLBOX_PALETTE_ #define _KO_TOOLBOX_PALETTE_ -#include +#include #include #include diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic b/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic index 0a5b745b2..6375bb554 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