summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--interfaces/khexedit/byteseditinterface.h58
-rw-r--r--interfaces/khexedit/charcolumninterface.h2
-rw-r--r--interfaces/khexedit/clipboardinterface.h6
-rw-r--r--interfaces/khexedit/valuecolumninterface.h2
-rw-r--r--interfaces/khexedit/zoominterface.h2
-rw-r--r--interfaces/kregexpeditor/kregexpeditorinterface.h4
-rw-r--r--interfaces/ktexteditor/blockselectioninterface.cpp2
-rw-r--r--interfaces/ktexteditor/clipboardinterface.cpp2
-rw-r--r--interfaces/ktexteditor/codecompletioninterface.cpp2
-rw-r--r--interfaces/ktexteditor/configinterface.cpp4
-rw-r--r--interfaces/ktexteditor/configinterfaceextension.cpp4
-rw-r--r--interfaces/ktexteditor/cursorinterface.cpp2
-rw-r--r--interfaces/ktexteditor/dynwordwrapinterface.cpp2
-rw-r--r--interfaces/ktexteditor/editinterface.cpp2
-rw-r--r--interfaces/ktexteditor/editinterfaceext.cpp2
-rw-r--r--interfaces/ktexteditor/encodinginterface.cpp2
-rw-r--r--interfaces/ktexteditor/highlightinginterface.cpp2
-rw-r--r--interfaces/ktexteditor/ktexteditor.cpp2
-rw-r--r--interfaces/ktexteditor/markinterface.cpp2
-rw-r--r--interfaces/ktexteditor/markinterfaceextension.cpp2
-rw-r--r--interfaces/ktexteditor/popupmenuinterface.cpp2
-rw-r--r--interfaces/ktexteditor/printinterface.cpp2
-rw-r--r--interfaces/ktexteditor/searchinterface.cpp2
-rw-r--r--interfaces/ktexteditor/selectioninterface.cpp4
-rw-r--r--interfaces/ktexteditor/selectioninterfaceext.cpp4
-rw-r--r--interfaces/ktexteditor/sessionconfiginterface.cpp6
-rw-r--r--interfaces/ktexteditor/templateinterface.cpp2
-rw-r--r--interfaces/ktexteditor/texthintinterface.cpp2
-rw-r--r--interfaces/ktexteditor/undointerface.cpp2
-rw-r--r--interfaces/ktexteditor/variableinterface.cpp2
-rw-r--r--interfaces/ktexteditor/viewcursorinterface.cpp2
-rw-r--r--interfaces/ktexteditor/viewstatusmsginterface.cpp2
-rw-r--r--interfaces/ktexteditor/wordwrapinterface.cpp2
-rw-r--r--interfaces/terminal/kde_terminal_interface.h2
-rw-r--r--interfaces/terminal/test/main.cc6
-rw-r--r--kate/interfaces/interfaces.cpp6
-rw-r--r--kdecore/kaccelmanager.cpp6
-rw-r--r--kdecore/kextsock.cpp2
-rw-r--r--kdecore/kextsock.h2
-rw-r--r--kdecore/kqiodevicegzip_p.cpp2
-rw-r--r--kdecore/kqiodevicegzip_p.h2
-rw-r--r--kdecore/network/kclientsocketbase.h2
-rw-r--r--kdecore/network/kresolverstandardworkers.cpp2
-rw-r--r--kdecore/network/ksocketdevice.cpp2
-rw-r--r--kdecore/network/ksocketdevice.h2
-rw-r--r--kdeui/kdockwidget.cpp14
-rw-r--r--kdeui/tests/kdockwidgettest.cpp4
-rw-r--r--kio/kio/klimitediodevice.h2
-rw-r--r--kio/kio/slave.h1
-rw-r--r--kmdi/kmdi/dockcontainer.cpp14
-rw-r--r--kmdi/kmdi/guiclient.cpp2
-rw-r--r--kmdi/kmdi/mainwindow.cpp8
-rw-r--r--kmdi/kmdidockcontainer.cpp18
-rw-r--r--kmdi/kmdiguiclient.cpp2
-rw-r--r--kmdi/kmdimainfrm.cpp8
-rw-r--r--kutils/kcmoduleproxy.h1
-rw-r--r--kutils/kcmultidialog.cpp2
-rw-r--r--kutils/kfinddialog.cpp2
-rw-r--r--kutils/kpluginselector.cpp2
59 files changed, 129 insertions, 127 deletions
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index 5acb9a259..a34e70e42 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -159,7 +159,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
if( !t )
return 0;
- return static_cast<BytesEditInterface*>( t->tqqt_cast("KHE::BytesEditInterface") );
+ return static_cast<BytesEditInterface*>( t->qt_cast("KHE::BytesEditInterface") );
}
/** tries to create an instance of a hexedit widget for arrays of chars (char[])
@@ -177,37 +177,37 @@ inline BytesEditInterface *bytesEditInterface( T *t )
* // is e.g. kdeutils (incl. khexedit2) installed, so a widget could be found and created?
* if( BytesEditWidget )
* {
- *   // fetch the editor interface
- *   KHE::BytesEditInterface *BytesEdit = KHE::bytesEditInterface( BytesEditWidget );
- *   Q_ASSERT( BytesEdit ); // This should not fail!
+ * � // fetch the editor interface
+ * � KHE::BytesEditInterface *BytesEdit = KHE::bytesEditInterface( BytesEditWidget );
+ * � Q_ASSERT( BytesEdit ); // This should not fail!
*
- *   // now use the editor.
- *   BytesEdit->setData( Buffer, BufferSize, -1 );
- *   BytesEdit->setMaxDataSize( BufferSize );
- *   BytesEdit->setReadOnly( false );
- *   BytesEdit->setAutoDelete( true );
+ * � // now use the editor.
+ * � BytesEdit->setData( Buffer, BufferSize, -1 );
+ * � BytesEdit->setMaxDataSize( BufferSize );
+ * � BytesEdit->setReadOnly( false );
+ * � BytesEdit->setAutoDelete( true );
*
- *   KHE::ValueColumnInterface *ValueColumn = KHE::valueColumnInterface( BytesEditWidget );
- *   if( ValueColumn )
- *   {
- *     ValueColumn->setCoding( KHE::ValueColumnInterface::BinaryCoding );
- *     ValueColumn->setByteSpacingWidth( 2 );
- *     ValueColumn->setNoOfGroupedBytes( 4 );
- *     ValueColumn->setGroupSpacingWidth( 12 );
- *   }
+ * � KHE::ValueColumnInterface *ValueColumn = KHE::valueColumnInterface( BytesEditWidget );
+ * � if( ValueColumn )
+ * � {
+ * � � ValueColumn->setCoding( KHE::ValueColumnInterface::BinaryCoding );
+ * � � ValueColumn->setByteSpacingWidth( 2 );
+ * � � ValueColumn->setNoOfGroupedBytes( 4 );
+ * � � ValueColumn->setGroupSpacingWidth( 12 );
+ * � }
*
- *   KHE::CharColumnInterface *CharColumn = KHE::charColumnInterface( BytesEditWidget );
- *   if( CharColumn )
- *   {
- *     CharColumn->setShowUnprintable( false );
- *     CharColumn->setSubstituteChar( '*' );
- *   }
- *   KHE::ClipboardInterface *Clipboard = KHE::clipboardInterface( BytesEditWidget );
- *   if( Clipboard )
- *   {
- *     // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky...
- *     connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) );
- *   }
+ * � KHE::CharColumnInterface *CharColumn = KHE::charColumnInterface( BytesEditWidget );
+ * � if( CharColumn )
+ * � {
+ * � � CharColumn->setShowUnprintable( false );
+ * � � CharColumn->setSubstituteChar( '*' );
+ * � }
+ * � KHE::ClipboardInterface *Clipboard = KHE::clipboardInterface( BytesEditWidget );
+ * � if( Clipboard )
+ * � {
+ * � � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky...
+ * � � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) );
+ * � }
* }
* \endcode
*
diff --git a/interfaces/khexedit/charcolumninterface.h b/interfaces/khexedit/charcolumninterface.h
index 753ff7ab1..4221de0c4 100644
--- a/interfaces/khexedit/charcolumninterface.h
+++ b/interfaces/khexedit/charcolumninterface.h
@@ -97,7 +97,7 @@ CharColumnInterface *charColumnInterface( T *t )
if( !t )
return 0;
- return static_cast<CharColumnInterface*>( t->tqqt_cast("KHE::CharColumnInterface") );
+ return static_cast<CharColumnInterface*>( t->qt_cast("KHE::CharColumnInterface") );
}
}
diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h
index 0e106aa32..6b5f4fab2 100644
--- a/interfaces/khexedit/clipboardinterface.h
+++ b/interfaces/khexedit/clipboardinterface.h
@@ -34,8 +34,8 @@ namespace KHE
* KHE::ClipboardInterface *Clipboard = KHE::clipboardInterface( BytesEditWidget );
* if( Clipboard )
* {
- *   // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky...
- *   connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) );
+ * � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky...
+ * � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) );
* }
* \endcode
*
@@ -78,7 +78,7 @@ ClipboardInterface *clipboardInterface( T *t )
if( !t )
return 0;
- return static_cast<ClipboardInterface*>( t->tqqt_cast("KHE::ClipboardInterface") );
+ return static_cast<ClipboardInterface*>( t->qt_cast("KHE::ClipboardInterface") );
}
}
diff --git a/interfaces/khexedit/valuecolumninterface.h b/interfaces/khexedit/valuecolumninterface.h
index e23c91761..7dafa7d42 100644
--- a/interfaces/khexedit/valuecolumninterface.h
+++ b/interfaces/khexedit/valuecolumninterface.h
@@ -162,7 +162,7 @@ ValueColumnInterface *valueColumnInterface( T *t )
if( !t )
return 0;
- return static_cast<ValueColumnInterface*>( t->tqqt_cast("KHE::ValueColumnInterface") );
+ return static_cast<ValueColumnInterface*>( t->qt_cast("KHE::ValueColumnInterface") );
}
}
diff --git a/interfaces/khexedit/zoominterface.h b/interfaces/khexedit/zoominterface.h
index 5fdaa8c24..494fbfd86 100644
--- a/interfaces/khexedit/zoominterface.h
+++ b/interfaces/khexedit/zoominterface.h
@@ -71,7 +71,7 @@ ZoomInterface *zoomInterface( T *t )
if( !t )
return 0;
- return static_cast<ZoomInterface*>( t->tqqt_cast("KHE::ZoomInterface") );
+ return static_cast<ZoomInterface*>( t->qt_cast("KHE::ZoomInterface") );
}
}
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index c10b86ea9..01fab0fdf 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -25,7 +25,7 @@
* TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
* if ( editorDialog ) {
* // kdeutils was installed, so the dialog was found fetch the editor interface
- * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->tqqt_cast( "KRegExpEditorInterface" ) );
+ * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->qt_cast( "KRegExpEditorInterface" ) );
* Q_ASSERT( editor ); // This should not fail!
*
* // now use the editor.
@@ -53,7 +53,7 @@
* "KRegExpEditor/KRegExpEditor", TQString::null, parent );
* if ( editorWidget ) {
* // kdeutils was installed, so the widget was found fetch the editor interface
- * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->tqqt_cast( "KRegExpEditorInterface" ) );
+ * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->qt_cast( "KRegExpEditorInterface" ) );
* Q_ASSERT( editor ); // This should not fail!
*
* // now use the editor.
diff --git a/interfaces/ktexteditor/blockselectioninterface.cpp b/interfaces/ktexteditor/blockselectioninterface.cpp
index af3372829..c1af4a6ed 100644
--- a/interfaces/ktexteditor/blockselectioninterface.cpp
+++ b/interfaces/ktexteditor/blockselectioninterface.cpp
@@ -70,5 +70,5 @@ BlockSelectionInterface *KTextEditor::blockSelectionInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<BlockSelectionInterface*>(doc->tqqt_cast("KTextEditor::BlockSelectionInterface"));
+ return static_cast<BlockSelectionInterface*>(doc->qt_cast("KTextEditor::BlockSelectionInterface"));
}
diff --git a/interfaces/ktexteditor/clipboardinterface.cpp b/interfaces/ktexteditor/clipboardinterface.cpp
index c1bc2803f..4401b29de 100644
--- a/interfaces/ktexteditor/clipboardinterface.cpp
+++ b/interfaces/ktexteditor/clipboardinterface.cpp
@@ -52,5 +52,5 @@ ClipboardInterface *KTextEditor::clipboardInterface (View *view)
if (!view)
return 0;
- return static_cast<ClipboardInterface*>(view->tqqt_cast("KTextEditor::ClipboardInterface"));
+ return static_cast<ClipboardInterface*>(view->qt_cast("KTextEditor::ClipboardInterface"));
}
diff --git a/interfaces/ktexteditor/codecompletioninterface.cpp b/interfaces/ktexteditor/codecompletioninterface.cpp
index 1d185a629..ae60b2162 100644
--- a/interfaces/ktexteditor/codecompletioninterface.cpp
+++ b/interfaces/ktexteditor/codecompletioninterface.cpp
@@ -45,7 +45,7 @@ CodeCompletionInterface *KTextEditor::codeCompletionInterface (View *view)
if (!view)
return 0;
- return static_cast<CodeCompletionInterface*>(view->tqqt_cast("KTextEditor::CodeCompletionInterface"));
+ return static_cast<CodeCompletionInterface*>(view->qt_cast("KTextEditor::CodeCompletionInterface"));
}
diff --git a/interfaces/ktexteditor/configinterface.cpp b/interfaces/ktexteditor/configinterface.cpp
index 7a88261c9..2ca2e4b12 100644
--- a/interfaces/ktexteditor/configinterface.cpp
+++ b/interfaces/ktexteditor/configinterface.cpp
@@ -67,7 +67,7 @@ ConfigInterface *KTextEditor::configInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<ConfigInterface*>(doc->tqqt_cast("KTextEditor::ConfigInterface"));
+ return static_cast<ConfigInterface*>(doc->qt_cast("KTextEditor::ConfigInterface"));
}
ConfigInterface *KTextEditor::configInterface (Plugin *plugin)
@@ -75,5 +75,5 @@ ConfigInterface *KTextEditor::configInterface (Plugin *plugin)
if (!plugin)
return 0;
- return static_cast<ConfigInterface*>(plugin->tqqt_cast("KTextEditor::ConfigInterface"));
+ return static_cast<ConfigInterface*>(plugin->qt_cast("KTextEditor::ConfigInterface"));
}
diff --git a/interfaces/ktexteditor/configinterfaceextension.cpp b/interfaces/ktexteditor/configinterfaceextension.cpp
index fe4704d44..8557c422f 100644
--- a/interfaces/ktexteditor/configinterfaceextension.cpp
+++ b/interfaces/ktexteditor/configinterfaceextension.cpp
@@ -72,7 +72,7 @@ ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Document *doc)
if (!doc)
return 0;
- return static_cast<ConfigInterfaceExtension*>(doc->tqqt_cast("KTextEditor::ConfigInterfaceExtension"));
+ return static_cast<ConfigInterfaceExtension*>(doc->qt_cast("KTextEditor::ConfigInterfaceExtension"));
}
ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Plugin *plugin)
@@ -80,5 +80,5 @@ ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Plugin *plugin)
if (!plugin)
return 0;
- return static_cast<ConfigInterfaceExtension*>(plugin->tqqt_cast("KTextEditor::ConfigInterfaceExtension"));
+ return static_cast<ConfigInterfaceExtension*>(plugin->qt_cast("KTextEditor::ConfigInterfaceExtension"));
}
diff --git a/interfaces/ktexteditor/cursorinterface.cpp b/interfaces/ktexteditor/cursorinterface.cpp
index 3b7857bbb..91a14b06a 100644
--- a/interfaces/ktexteditor/cursorinterface.cpp
+++ b/interfaces/ktexteditor/cursorinterface.cpp
@@ -65,5 +65,5 @@ CursorInterface *KTextEditor::cursorInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<CursorInterface*>(doc->tqqt_cast("KTextEditor::CursorInterface"));
+ return static_cast<CursorInterface*>(doc->qt_cast("KTextEditor::CursorInterface"));
}
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.cpp b/interfaces/ktexteditor/dynwordwrapinterface.cpp
index a60f1129b..49d4060c0 100644
--- a/interfaces/ktexteditor/dynwordwrapinterface.cpp
+++ b/interfaces/ktexteditor/dynwordwrapinterface.cpp
@@ -65,5 +65,5 @@ DynWordWrapInterface *KTextEditor::dynWordWrapInterface (View *view)
if (!view)
return 0;
- return static_cast<DynWordWrapInterface*>(view->tqqt_cast("KTextEditor::DynWordWrapInterface"));
+ return static_cast<DynWordWrapInterface*>(view->qt_cast("KTextEditor::DynWordWrapInterface"));
}
diff --git a/interfaces/ktexteditor/editinterface.cpp b/interfaces/ktexteditor/editinterface.cpp
index 3a03002b2..6722fc555 100644
--- a/interfaces/ktexteditor/editinterface.cpp
+++ b/interfaces/ktexteditor/editinterface.cpp
@@ -52,6 +52,6 @@ EditInterface *KTextEditor::editInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<EditInterface*>(doc->tqqt_cast("KTextEditor::EditInterface"));
+ return static_cast<EditInterface*>(doc->qt_cast("KTextEditor::EditInterface"));
}
diff --git a/interfaces/ktexteditor/editinterfaceext.cpp b/interfaces/ktexteditor/editinterfaceext.cpp
index 944b662d9..7d4acf55f 100644
--- a/interfaces/ktexteditor/editinterfaceext.cpp
+++ b/interfaces/ktexteditor/editinterfaceext.cpp
@@ -45,6 +45,6 @@ EditInterfaceExt *KTextEditor::editInterfaceExt (Document *doc)
if (!doc)
return 0;
- return static_cast<EditInterfaceExt*>(doc->tqqt_cast("KTextEditor::EditInterfaceExt"));
+ return static_cast<EditInterfaceExt*>(doc->qt_cast("KTextEditor::EditInterfaceExt"));
}
diff --git a/interfaces/ktexteditor/encodinginterface.cpp b/interfaces/ktexteditor/encodinginterface.cpp
index e864525e0..341847fb7 100644
--- a/interfaces/ktexteditor/encodinginterface.cpp
+++ b/interfaces/ktexteditor/encodinginterface.cpp
@@ -72,5 +72,5 @@ EncodingInterface *KTextEditor::encodingInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<EncodingInterface*>(doc->tqqt_cast("KTextEditor::EncodingInterface"));
+ return static_cast<EncodingInterface*>(doc->qt_cast("KTextEditor::EncodingInterface"));
}
diff --git a/interfaces/ktexteditor/highlightinginterface.cpp b/interfaces/ktexteditor/highlightinginterface.cpp
index 188545079..f606ab5c0 100644
--- a/interfaces/ktexteditor/highlightinginterface.cpp
+++ b/interfaces/ktexteditor/highlightinginterface.cpp
@@ -65,5 +65,5 @@ HighlightingInterface *KTextEditor::highlightingInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<HighlightingInterface*>(doc->tqqt_cast("KTextEditor::HighlightingInterface"));
+ return static_cast<HighlightingInterface*>(doc->qt_cast("KTextEditor::HighlightingInterface"));
}
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp
index 09bd63ea9..ef199c819 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/ktexteditor/ktexteditor.cpp
@@ -226,6 +226,6 @@ PluginViewInterface *KTextEditor::pluginViewInterface (Plugin *plugin)
if (!plugin)
return 0;
- return static_cast<PluginViewInterface*>(plugin->tqqt_cast("KTextEditor::PluginViewInterface"));
+ return static_cast<PluginViewInterface*>(plugin->qt_cast("KTextEditor::PluginViewInterface"));
}
diff --git a/interfaces/ktexteditor/markinterface.cpp b/interfaces/ktexteditor/markinterface.cpp
index 97c23f1e7..d711b5245 100644
--- a/interfaces/ktexteditor/markinterface.cpp
+++ b/interfaces/ktexteditor/markinterface.cpp
@@ -65,7 +65,7 @@ MarkInterface *KTextEditor::markInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<MarkInterface*>(doc->tqqt_cast("KTextEditor::MarkInterface"));
+ return static_cast<MarkInterface*>(doc->qt_cast("KTextEditor::MarkInterface"));
}
int MarkInterface::reservedMarkersCount()
diff --git a/interfaces/ktexteditor/markinterfaceextension.cpp b/interfaces/ktexteditor/markinterfaceextension.cpp
index 19b327e96..57c981421 100644
--- a/interfaces/ktexteditor/markinterfaceextension.cpp
+++ b/interfaces/ktexteditor/markinterfaceextension.cpp
@@ -65,5 +65,5 @@ MarkInterfaceExtension *KTextEditor::markInterfaceExtension (Document *doc)
if (!doc)
return 0;
- return static_cast<MarkInterfaceExtension*>(doc->tqqt_cast("KTextEditor::MarkInterfaceExtension"));
+ return static_cast<MarkInterfaceExtension*>(doc->qt_cast("KTextEditor::MarkInterfaceExtension"));
}
diff --git a/interfaces/ktexteditor/popupmenuinterface.cpp b/interfaces/ktexteditor/popupmenuinterface.cpp
index 6de6f201c..d2d51e4af 100644
--- a/interfaces/ktexteditor/popupmenuinterface.cpp
+++ b/interfaces/ktexteditor/popupmenuinterface.cpp
@@ -65,5 +65,5 @@ PopupMenuInterface *KTextEditor::popupMenuInterface (View *view)
if (!view)
return 0;
- return static_cast<PopupMenuInterface*>(view->tqqt_cast("KTextEditor::PopupMenuInterface"));
+ return static_cast<PopupMenuInterface*>(view->qt_cast("KTextEditor::PopupMenuInterface"));
}
diff --git a/interfaces/ktexteditor/printinterface.cpp b/interfaces/ktexteditor/printinterface.cpp
index 0f6c6afd8..936e803ea 100644
--- a/interfaces/ktexteditor/printinterface.cpp
+++ b/interfaces/ktexteditor/printinterface.cpp
@@ -70,5 +70,5 @@ PrintInterface *KTextEditor::printInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<PrintInterface*>(doc->tqqt_cast("KTextEditor::PrintInterface"));
+ return static_cast<PrintInterface*>(doc->qt_cast("KTextEditor::PrintInterface"));
}
diff --git a/interfaces/ktexteditor/searchinterface.cpp b/interfaces/ktexteditor/searchinterface.cpp
index e1a58ed6b..d23a25e31 100644
--- a/interfaces/ktexteditor/searchinterface.cpp
+++ b/interfaces/ktexteditor/searchinterface.cpp
@@ -51,5 +51,5 @@ SearchInterface *KTextEditor::searchInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<SearchInterface*>(doc->tqqt_cast("KTextEditor::SearchInterface"));
+ return static_cast<SearchInterface*>(doc->qt_cast("KTextEditor::SearchInterface"));
}
diff --git a/interfaces/ktexteditor/selectioninterface.cpp b/interfaces/ktexteditor/selectioninterface.cpp
index 61bc7a995..2e9ae5204 100644
--- a/interfaces/ktexteditor/selectioninterface.cpp
+++ b/interfaces/ktexteditor/selectioninterface.cpp
@@ -52,7 +52,7 @@ SelectionInterface *KTextEditor::selectionInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<SelectionInterface*>(doc->tqqt_cast("KTextEditor::SelectionInterface"));
+ return static_cast<SelectionInterface*>(doc->qt_cast("KTextEditor::SelectionInterface"));
}
SelectionInterface *KTextEditor::selectionInterface (View *view)
@@ -60,6 +60,6 @@ SelectionInterface *KTextEditor::selectionInterface (View *view)
if (!view)
return 0;
- return static_cast<SelectionInterface*>(view->tqqt_cast("KTextEditor::SelectionInterface"));
+ return static_cast<SelectionInterface*>(view->qt_cast("KTextEditor::SelectionInterface"));
}
diff --git a/interfaces/ktexteditor/selectioninterfaceext.cpp b/interfaces/ktexteditor/selectioninterfaceext.cpp
index c8404a9b5..f59468c17 100644
--- a/interfaces/ktexteditor/selectioninterfaceext.cpp
+++ b/interfaces/ktexteditor/selectioninterfaceext.cpp
@@ -68,7 +68,7 @@ SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (Document *doc)
if (!doc)
return 0;
- return static_cast<SelectionInterfaceExt*>(doc->tqqt_cast("KTextEditor::SelectionInterfaceExt"));
+ return static_cast<SelectionInterfaceExt*>(doc->qt_cast("KTextEditor::SelectionInterfaceExt"));
}
SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (View *view)
@@ -76,7 +76,7 @@ SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (View *view)
if (!view)
return 0;
- return static_cast<SelectionInterfaceExt*>(view->tqqt_cast("KTextEditor::SelectionInterfaceExt"));
+ return static_cast<SelectionInterfaceExt*>(view->qt_cast("KTextEditor::SelectionInterfaceExt"));
}
//END KTextEditor::SelectionInterfaceExt
diff --git a/interfaces/ktexteditor/sessionconfiginterface.cpp b/interfaces/ktexteditor/sessionconfiginterface.cpp
index 1720584cc..7180aae38 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.cpp
+++ b/interfaces/ktexteditor/sessionconfiginterface.cpp
@@ -68,7 +68,7 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<SessionConfigInterface*>(doc->tqqt_cast("KTextEditor::SessionConfigInterface"));
+ return static_cast<SessionConfigInterface*>(doc->qt_cast("KTextEditor::SessionConfigInterface"));
}
SessionConfigInterface *KTextEditor::sessionConfigInterface (View *view)
@@ -76,7 +76,7 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (View *view)
if (!view)
return 0;
- return static_cast<SessionConfigInterface*>(view->tqqt_cast("KTextEditor::SessionConfigInterface"));
+ return static_cast<SessionConfigInterface*>(view->qt_cast("KTextEditor::SessionConfigInterface"));
}
SessionConfigInterface *KTextEditor::sessionConfigInterface (Plugin *plugin)
@@ -84,5 +84,5 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (Plugin *plugin)
if (!plugin)
return 0;
- return static_cast<SessionConfigInterface*>(plugin->tqqt_cast("KTextEditor::SessionConfigInterface"));
+ return static_cast<SessionConfigInterface*>(plugin->qt_cast("KTextEditor::SessionConfigInterface"));
}
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index 10576fe15..126747260 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/ktexteditor/templateinterface.cpp
@@ -192,6 +192,6 @@ TemplateInterface *KTextEditor::templateInterface ( KTextEditor::Document *doc )
if ( !doc )
return 0;
- return static_cast<TemplateInterface*>( doc->tqqt_cast( "KTextEditor::TemplateInterface" ) );
+ return static_cast<TemplateInterface*>( doc->qt_cast( "KTextEditor::TemplateInterface" ) );
}
diff --git a/interfaces/ktexteditor/texthintinterface.cpp b/interfaces/ktexteditor/texthintinterface.cpp
index 3a6c3a759..079a1edda 100644
--- a/interfaces/ktexteditor/texthintinterface.cpp
+++ b/interfaces/ktexteditor/texthintinterface.cpp
@@ -58,7 +58,7 @@ TextHintInterface *textHintInterface (View *view)
if (!view)
return 0;
- return static_cast<TextHintInterface*>(view->tqqt_cast("KTextEditor::TextHintInterface"));
+ return static_cast<TextHintInterface*>(view->qt_cast("KTextEditor::TextHintInterface"));
}
diff --git a/interfaces/ktexteditor/undointerface.cpp b/interfaces/ktexteditor/undointerface.cpp
index c86a3ecf2..d19a56deb 100644
--- a/interfaces/ktexteditor/undointerface.cpp
+++ b/interfaces/ktexteditor/undointerface.cpp
@@ -70,5 +70,5 @@ UndoInterface *KTextEditor::undoInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<UndoInterface*>(doc->tqqt_cast("KTextEditor::UndoInterface"));
+ return static_cast<UndoInterface*>(doc->qt_cast("KTextEditor::UndoInterface"));
}
diff --git a/interfaces/ktexteditor/variableinterface.cpp b/interfaces/ktexteditor/variableinterface.cpp
index f8bfcfe91..0ac55167e 100644
--- a/interfaces/ktexteditor/variableinterface.cpp
+++ b/interfaces/ktexteditor/variableinterface.cpp
@@ -44,5 +44,5 @@ VariableInterface *KTextEditor::variableInterface( Document *doc )
if ( ! doc )
return 0;
- return static_cast<VariableInterface*>(doc->tqqt_cast("KTextEditor::VariableInterface"));
+ return static_cast<VariableInterface*>(doc->qt_cast("KTextEditor::VariableInterface"));
}
diff --git a/interfaces/ktexteditor/viewcursorinterface.cpp b/interfaces/ktexteditor/viewcursorinterface.cpp
index dd718a7dd..0c834be42 100644
--- a/interfaces/ktexteditor/viewcursorinterface.cpp
+++ b/interfaces/ktexteditor/viewcursorinterface.cpp
@@ -70,5 +70,5 @@ ViewCursorInterface *KTextEditor::viewCursorInterface (View *view)
if (!view)
return 0;
- return static_cast<ViewCursorInterface*>(view->tqqt_cast("KTextEditor::ViewCursorInterface"));
+ return static_cast<ViewCursorInterface*>(view->qt_cast("KTextEditor::ViewCursorInterface"));
}
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/ktexteditor/viewstatusmsginterface.cpp
index 643e2e798..ff0815c89 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.cpp
+++ b/interfaces/ktexteditor/viewstatusmsginterface.cpp
@@ -72,5 +72,5 @@ ViewStatusMsgInterface *KTextEditor::viewStatusMsgInterface (View *view)
if (!view)
return 0;
- return static_cast<ViewStatusMsgInterface*>(view->tqqt_cast("KTextEditor::ViewStatusMsgInterface"));
+ return static_cast<ViewStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewStatusMsgInterface"));
}
diff --git a/interfaces/ktexteditor/wordwrapinterface.cpp b/interfaces/ktexteditor/wordwrapinterface.cpp
index ff6d17362..3afe5c230 100644
--- a/interfaces/ktexteditor/wordwrapinterface.cpp
+++ b/interfaces/ktexteditor/wordwrapinterface.cpp
@@ -66,5 +66,5 @@ WordWrapInterface *KTextEditor::wordWrapInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<WordWrapInterface*>(doc->tqqt_cast("KTextEditor::WordWrapInterface"));
+ return static_cast<WordWrapInterface*>(doc->qt_cast("KTextEditor::WordWrapInterface"));
}
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 0e3acb22f..450d1e27d 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -60,7 +60,7 @@ class TQStrList;
* setCentralWidget( p->widget() );
*
* // cast the part to the TerminalInterface..
- * TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) );
+ * TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) );
* if( ! t )
* {
* // This probably happens because the konsole that is installed
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index 905eedbb6..be3f4165e 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -20,7 +20,7 @@ Win::Win()
KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) );
setCentralWidget( p->widget() );
- TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) );
+ TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) );
t->showShellInDir( TQDir::home().path() );
// TQStrList l;
// l.append( "python" );
@@ -46,11 +46,11 @@ int main( int argc, char** argv )
void Win::pythonExited()
{
std::cerr << "hee, " << p << std::endl;
- std::cerr << ( p->tqqt_cast( "TerminalInterface" ) ) << std::endl;
+ std::cerr << ( p->qt_cast( "TerminalInterface" ) ) << std::endl;
// KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) );
disconnect(p, TQT_SIGNAL( processExited() ),
this, TQT_SLOT( pythonExited() ));
- TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) );
+ TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) );
TQStrList l;
l.append( "echo" );
l.append( "hello world" );
diff --git a/kate/interfaces/interfaces.cpp b/kate/interfaces/interfaces.cpp
index 59abc37cc..ad20959b6 100644
--- a/kate/interfaces/interfaces.cpp
+++ b/kate/interfaces/interfaces.cpp
@@ -100,7 +100,7 @@ Document *document (KTextEditor::Document *doc)
if (!doc)
return 0;
- return static_cast<Document*>(doc->tqqt_cast("Kate::Document"));
+ return static_cast<Document*>(doc->qt_cast("Kate::Document"));
}
DocumentExt *documentExt (KTextEditor::Document *doc)
@@ -108,7 +108,7 @@ DocumentExt *documentExt (KTextEditor::Document *doc)
if (!doc)
return 0;
- return static_cast<DocumentExt*>(doc->tqqt_cast("Kate::DocumentExt"));
+ return static_cast<DocumentExt*>(doc->qt_cast("Kate::DocumentExt"));
}
Document *createDocument ( TQObject *parent, const char *name )
@@ -121,7 +121,7 @@ View *view (KTextEditor::View *view)
if (!view)
return 0;
- return static_cast<View*>(view->tqqt_cast("Kate::View"));
+ return static_cast<View*>(view->qt_cast("Kate::View"));
}
}
diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp
index d2f5f81f6..3447803d1 100644
--- a/kdecore/kaccelmanager.cpp
+++ b/kdecore/kaccelmanager.cpp
@@ -1,5 +1,5 @@
/* This file is part of the KDE project
- Copyright (C) 2002 Matthias Hölzer-Klüpfel <mhk@kde.org>
+ Copyright (C) 2002 Matthias H�lzer-Kl�pfel <mhk@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -320,7 +320,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
if (dynamic_cast<TQComboBox*>(w) || dynamic_cast<TQLineEdit*>(w) ||
dynamic_cast<TQTextEdit*>(w) || dynamic_cast<TQTextView*>(w) ||
- dynamic_cast<TQSpinBox*>(w) || w->tqqt_cast( "KMultiTabBar" ))
+ dynamic_cast<TQSpinBox*>(w) || w->qt_cast( "KMultiTabBar" ))
return;
// now treat 'ordinary' widgets
@@ -661,7 +661,7 @@ void KAccelString::dump()
The algorithm has some advantages:
* it favors 'nice' accelerators (first characters in a word, etc.)
- * it is quite fast, O(N²)
+ * it is quite fast, O(N�)
* it is easy to understand :-)
The disadvantages:
diff --git a/kdecore/kextsock.cpp b/kdecore/kextsock.cpp
index c6561bad4..7517bb8e0 100644
--- a/kdecore/kextsock.cpp
+++ b/kdecore/kextsock.cpp
@@ -1262,7 +1262,7 @@ void KExtendedSocket::cancelAsyncConnect()
d->status = lookupDone;
}
-bool KExtendedSocket::open(int mode)
+bool KExtendedSocket::open(OpenMode mode)
{
if (mode != IO_Raw | IO_ReadWrite)
return false; // invalid open mode
diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h
index 02922ec33..7783b319b 100644
--- a/kdecore/kextsock.h
+++ b/kdecore/kextsock.h
@@ -627,7 +627,7 @@ public:
* @return true if successful, false when an error occurred or the most was
* not correct
*/
- virtual bool open(int mode = IO_Raw | IO_ReadWrite);
+ virtual bool open(OpenMode mode = (OpenMode)(IO_Raw | IO_ReadWrite));
/**
* Closes the socket. If we have data still in the write buffer yet to be
diff --git a/kdecore/kqiodevicegzip_p.cpp b/kdecore/kqiodevicegzip_p.cpp
index 14bb38125..84409ddb0 100644
--- a/kdecore/kqiodevicegzip_p.cpp
+++ b/kdecore/kqiodevicegzip_p.cpp
@@ -37,7 +37,7 @@ KQIODeviceGZip::~KQIODeviceGZip(void)
close();
}
-bool KQIODeviceGZip::open(int mode)
+bool KQIODeviceGZip::open(OpenMode mode)
{
if (m_gzfile)
close(); // One file is already open, so close it first.
diff --git a/kdecore/kqiodevicegzip_p.h b/kdecore/kqiodevicegzip_p.h
index 8c547a742..8ac0d3a0f 100644
--- a/kdecore/kqiodevicegzip_p.h
+++ b/kdecore/kqiodevicegzip_p.h
@@ -38,7 +38,7 @@ public:
KQIODeviceGZip(const TQString& filename);
~KQIODeviceGZip(void);
- bool open(int mode);
+ bool open(OpenMode mode);
void close(void);
void flush(void);
diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h
index bf1c8c04e..7ec934483 100644
--- a/kdecore/network/kclientsocketbase.h
+++ b/kdecore/network/kclientsocketbase.h
@@ -281,7 +281,7 @@ public:
*
* You should not call this function; instead, use @ref connect
*/
- virtual inline bool open(int)
+ virtual inline bool open(OpenMode)
{ return connect(); }
/**
diff --git a/kdecore/network/kresolverstandardworkers.cpp b/kdecore/network/kresolverstandardworkers.cpp
index 08bd57121..185879841 100644
--- a/kdecore/network/kresolverstandardworkers.cpp
+++ b/kdecore/network/kresolverstandardworkers.cpp
@@ -667,7 +667,7 @@ KResolver::ErrorCodes KStandardWorker::addUnix()
if (!m_encodedName.isEmpty())
return KResolver::AddrFamily; // non local hostname
- if (protocol() || static_cast<const char *>(protocolName()))
+ if (protocol() || !protocolName().isEmpty())
return KResolver::BadFlags; // cannot have Unix sockets with protocols
TQString pathname = serviceName();
diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp
index 8b4789e02..54c15b156 100644
--- a/kdecore/network/ksocketdevice.cpp
+++ b/kdecore/network/ksocketdevice.cpp
@@ -171,7 +171,7 @@ bool KSocketDevice::setSocketOptions(int opts)
return true; // all went well
}
-bool KSocketDevice::open(int)
+bool KSocketDevice::open(OpenMode)
{
resetError();
return false;
diff --git a/kdecore/network/ksocketdevice.h b/kdecore/network/ksocketdevice.h
index 5409335aa..4e7c6353d 100644
--- a/kdecore/network/ksocketdevice.h
+++ b/kdecore/network/ksocketdevice.h
@@ -142,7 +142,7 @@ public:
/**
* Reimplementation from TQIODevice. You should not call this function in sockets.
*/
- virtual bool open(int mode);
+ virtual bool open(OpenMode mode);
/**
* Closes the socket. Reimplemented from TQIODevice.
diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp
index 5629d5cf8..154757a33 100644
--- a/kdeui/kdockwidget.cpp
+++ b/kdeui/kdockwidget.cpp
@@ -932,7 +932,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
if (neighbor==this)
return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
else
- if (neighbor->getWidget() && (neighbor->getWidget()->tqqt_cast("KDockTabGroup")))
+ if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup")))
return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0));
else
return neighbor;
@@ -1238,7 +1238,7 @@ void KDockWidget::setForcedFixedWidth(int w)
setFixedWidth(w);
if (!parent()) return;
if (parent()->inherits("KDockSplitter"))
- static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->setForcedFixedWidth(this,w);
+ static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w);
}
void KDockWidget::setForcedFixedHeight(int h)
@@ -1247,7 +1247,7 @@ void KDockWidget::setForcedFixedHeight(int h)
setFixedHeight(h);
if (!parent()) return;
if (parent()->inherits("KDockSplitter"))
- static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->setForcedFixedHeight(this,h);
+ static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h);
}
int KDockWidget::forcedFixedWidth()
@@ -1270,7 +1270,7 @@ void KDockWidget::restoreFromForcedFixedSize()
setMaximumHeight(32000);
if (!parent()) return;
if (parent()->inherits("KDockSplitter"))
- static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this);
+ static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this);
}
void KDockWidget::toDesktop()
@@ -3180,7 +3180,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) {
if (parentDockWidget() && parentDockWidget()->parent()) {
kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl;
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
- tqparent()->tqqt_cast("KDockSplitter"));
+ tqparent()->qt_cast("KDockSplitter"));
if (sp)
sp->resizeEvent(0);
}
@@ -3192,7 +3192,7 @@ void KDockContainer::deactivateOverlapMode() {
if (parentDockWidget() && parentDockWidget()->parent()) {
kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl;
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
- tqparent()->tqqt_cast("KDockSplitter"));
+ tqparent()->qt_cast("KDockSplitter"));
if (sp)
sp->resizeEvent(0);
}
@@ -3280,7 +3280,7 @@ void KDockContainer::prepareSave(TQStringList &names)
TQWidget *KDockTabGroup::transientTo() {
TQWidget *tT=0;
for (int i=0;i<count();i++) {
- KDockWidget *dw=static_cast<KDockWidget*>(page(i)->tqqt_cast("KDockWidget"));
+ KDockWidget *dw=static_cast<KDockWidget*>(page(i)->qt_cast("KDockWidget"));
TQWidget *tmp;
if ((tmp=dw->transientTo())) {
if (!tT) tT=tmp;
diff --git a/kdeui/tests/kdockwidgettest.cpp b/kdeui/tests/kdockwidgettest.cpp
index b2f7b8bd9..08a7e42b3 100644
--- a/kdeui/tests/kdockwidgettest.cpp
+++ b/kdeui/tests/kdockwidgettest.cpp
@@ -101,7 +101,7 @@ DockApplication::DockApplication( const char* name )
l->setBackgroundColor(white);
l->setMinimumSize(100,100);
dock5->setWidget(l);
- if (l->tqqt_cast("KDockContainer")) qDebug("KDockContainer created for dock 5");
+ if (l->qt_cast("KDockContainer")) qDebug("KDockContainer created for dock 5");
/*****************************************************/
/*****************************************************/
@@ -112,7 +112,7 @@ DockApplication::DockApplication( const char* name )
l->setBackgroundColor(white);
l->setMinimumSize(100,100);
dock6->setWidget(l);
- if (l->tqqt_cast("KDockContainer")) qDebug("KDockContainer created for dock 6");
+ if (l->qt_cast("KDockContainer")) qDebug("KDockContainer created for dock 6");
/*****************************************************/
diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h
index 9d59c890e..f148d5215 100644
--- a/kio/kio/klimitediodevice.h
+++ b/kio/kio/klimitediodevice.h
@@ -47,7 +47,7 @@ public:
}
virtual ~KLimitedIODevice() {}
- virtual bool open( int m ) {
+ virtual bool open( OpenMode m ) {
//kdDebug(7005) << "KLimitedIODevice::open m=" << m << endl;
if ( m & IO_ReadOnly ) {
/*bool ok = false;
diff --git a/kio/kio/slave.h b/kio/kio/slave.h
index 790f7eab1..7c838f784 100644
--- a/kio/kio/slave.h
+++ b/kio/kio/slave.h
@@ -44,6 +44,7 @@ namespace KIO {
class KIO_EXPORT Slave : public KIO::SlaveInterface
{
Q_OBJECT
+ TQ_OBJECT
protected:
/**
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp
index 926728927..a22522ab3 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/kmdi/kmdi/dockcontainer.cpp
@@ -119,7 +119,7 @@ DockContainer::~DockContainer()
it = m_map.begin();
KDockWidget *w=it.key();
if (m_overlapButtons.tqcontains(w)) {
- (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
+ (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
m_overlapButtons.remove(w);
}
m_map.remove(w);
@@ -149,7 +149,7 @@ void DockContainer::init()
if ( parentDockWidget() && parentDockWidget()->parent() )
{
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
- tqparent()->tqqt_cast("KDockSplitter"));
+ tqparent()->qt_cast("KDockSplitter"));
if ( sp )
sp->setSeparatorPosX( m_separatorPos );
}
@@ -184,7 +184,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
if (((KDockWidget*)tqparentWidget())->mayBeShow())
((KDockWidget*)tqparentWidget())->dockBack();
- if (w->getHeader()->tqqt_cast("KDockWidgetHeader"))
+ if (w->getHeader()->qt_cast("KDockWidgetHeader"))
{
kdDebug(760)<<"*** KDockWidgetHeader has been found"<<endl;
@@ -357,7 +357,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
m_map.remove(w);
m_revMap.remove(id);
if (m_overlapButtons.tqcontains(w)) {
- (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
+ (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
m_overlapButtons.remove(w);
}
KDockContainer::removeWidget(w);
@@ -405,7 +405,7 @@ void DockContainer::tabClicked(int t)
}
m_ws->raiseWidget(t);
if (m_ws->widget(t)) {
- KDockWidget *tmpDw=static_cast<KDockWidget*>(m_ws->widget(t)->tqqt_cast("KDockWidget"));
+ KDockWidget *tmpDw=static_cast<KDockWidget*>(m_ws->widget(t)->qt_cast("KDockWidget"));
if (tmpDw) {
if (tmpDw->getWidget()) tmpDw->getWidget()->setFocus();
} else kdDebug(760)<<"Something really weird is going on"<<endl;
@@ -423,7 +423,7 @@ void DockContainer::tabClicked(int t)
if ( parentDockWidget() && parentDockWidget()->parent() )
{
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
- tqparent()->tqqt_cast("KDockSplitter"));
+ tqparent()->qt_cast("KDockSplitter"));
if ( sp )
m_separatorPos = sp->separatorPos();
}
@@ -476,7 +476,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
if ( parentDockWidget() && parentDockWidget()->parent() )
{
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
- tqparent()->tqqt_cast("KDockSplitter"));
+ tqparent()->qt_cast("KDockSplitter"));
if ( sp )
cfg->writeEntry( "separatorPosition", m_separatorPos );
}
diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp
index 54e8fc26a..c5d2ab115 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/kmdi/kmdi/guiclient.cpp
@@ -202,7 +202,7 @@ void ToggleToolViewAction::anDWChanged()
setChecked(true);
else if (isChecked() && (m_dw->parentDockTabGroup() &&
((static_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
- tqparent()->tqqt_cast("KDockWidget")))->mayBeShow())))
+ tqparent()->qt_cast("KDockWidget")))->mayBeShow())))
setChecked(false);
}
diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp
index be38a3f48..4b643e3d4 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/kmdi/kmdi/mainwindow.cpp
@@ -311,16 +311,16 @@ void MainWindow::setToolViewStyle(int flag)
{
d->m_styleIDEAlMode = flag; // see KMultiTabBar for the first 3 bits
- DockContainer *tmpL=(DockContainer*) (m_leftContainer->getWidget()->tqqt_cast("KMDI::DockContainer"));
+ DockContainer *tmpL=(DockContainer*) (m_leftContainer->getWidget()->qt_cast("KMDI::DockContainer"));
if (tmpL) tmpL->setStyle(flag);
- DockContainer *tmpR=(DockContainer*) (m_rightContainer->getWidget()->tqqt_cast("KMDI::DockContainer"));
+ DockContainer *tmpR=(DockContainer*) (m_rightContainer->getWidget()->qt_cast("KMDI::DockContainer"));
if (tmpR) tmpR->setStyle(flag);
- DockContainer *tmpT=(DockContainer*) (m_topContainer->getWidget()->tqqt_cast("KMDI::DockContainer"));
+ DockContainer *tmpT=(DockContainer*) (m_topContainer->getWidget()->qt_cast("KMDI::DockContainer"));
if (tmpT) tmpT->setStyle(flag);
- DockContainer *tmpB=(DockContainer*) (m_bottomContainer->getWidget()->tqqt_cast("KMDI::DockContainer"));
+ DockContainer *tmpB=(DockContainer*) (m_bottomContainer->getWidget()->qt_cast("KMDI::DockContainer"));
if (tmpB) tmpB->setStyle(flag);
d->m_toolviewStyle = flag;
diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp
index f8169a8b9..e14d826e4 100644
--- a/kmdi/kmdidockcontainer.cpp
+++ b/kmdi/kmdidockcontainer.cpp
@@ -140,7 +140,7 @@ KMdiDockContainer::~KMdiDockContainer()
KDockWidget *w = it.key();
if ( m_overlapButtons.tqcontains( w ) )
{
- ( static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] );
+ ( static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] );
m_overlapButtons.remove( w );
}
m_map.remove( w );
@@ -172,7 +172,7 @@ void KMdiDockContainer::init()
// try to restore splitter size
if ( parentDockWidget() && parentDockWidget()->tqparent() )
{
- KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->tqqt_cast( "KDockSplitter" ) );
+ KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
if ( sp )
sp->setSeparatorPosX( m_separatorPos );
}
@@ -207,12 +207,12 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() )
( ( KDockWidget* ) tqparentWidget() ) ->dockBack();
- if ( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) )
+ if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) )
{
kdDebug( 760 ) << k_funcinfo << "The dockwidget we're adding has a header" << endl;
kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl;
- KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) );
+ KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) );
KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" );
TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) );
@@ -272,7 +272,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
break;
}
- KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) );
+ KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) );
if ( !hdr )
{
kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl;
@@ -387,7 +387,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
m_revMap.remove( id );
if ( m_overlapButtons.tqcontains( w ) )
{
- ( static_cast<KDockWidgetHeader*>( w->getHeader() ->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] );
+ ( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] );
m_overlapButtons.remove( w );
}
KDockContainer::removeWidget( w );
@@ -442,7 +442,7 @@ void KMdiDockContainer::tabClicked( int t )
if ( m_ws->widget( t ) )
{
m_ws->raiseWidget( t );
- KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->tqqt_cast( "KDockWidget" ) );
+ KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->qt_cast( "KDockWidget" ) );
if ( tmpDw )
{
if ( tmpDw->getWidget() )
@@ -467,7 +467,7 @@ void KMdiDockContainer::tabClicked( int t )
// try save splitter position
if ( parentDockWidget() && parentDockWidget()->tqparent() )
{
- KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->tqqt_cast( "KDockSplitter" ) );
+ KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
if ( sp )
m_separatorPos = sp->separatorPos();
}
@@ -639,7 +639,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
if ( parentDockWidget() && parentDockWidget() ->tqparent() )
{
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() ->
- tqparent() ->tqqt_cast( "KDockSplitter" ) );
+ tqparent() ->qt_cast( "KDockSplitter" ) );
if ( sp )
cfg->writeEntry( "separatorPosition", m_separatorPos );
}
diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp
index 3eb559496..c99c05b01 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/kmdi/kmdiguiclient.cpp
@@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged()
setChecked( true );
else if ( isChecked() && ( m_dw->parentDockTabGroup() &&
( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
- tqparent() ->tqqt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
+ tqparent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
setChecked( false );
}
diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp
index 7afc6c32a..107c4d982 100644
--- a/kmdi/kmdimainfrm.cpp
+++ b/kmdi/kmdimainfrm.cpp
@@ -1739,28 +1739,28 @@ void KMdiMainFrm::setIDEAlModeStyle( int flags )
d->m_styleIDEAlMode = flags; // see KMultiTabBar for the first 3 bits
if ( m_leftContainer )
{
- KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) );
+ KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->qt_cast( "KMdiDockContainer" ) );
if ( tmpL )
tmpL->setStyle( flags );
}
if ( m_rightContainer )
{
- KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) );
+ KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->qt_cast( "KMdiDockContainer" ) );
if ( tmpR )
tmpR->setStyle( flags );
}
if ( m_topContainer )
{
- KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) );
+ KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->qt_cast( "KMdiDockContainer" ) );
if ( tmpT )
tmpT->setStyle( flags );
}
if ( m_bottomContainer )
{
- KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) );
+ KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->qt_cast( "KMdiDockContainer" ) );
if ( tmpB )
tmpB->setStyle( flags );
}
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index fea2cf47e..ff2b06579 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -68,6 +68,7 @@ class KProcess;
class KUTILS_EXPORT KCModuleProxy : public TQWidget
{
Q_OBJECT
+TQ_OBJECT
friend class KCModuleProxyRootCommunicatorImpl;
diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp
index 217f40bd4..3efdbf5b8 100644
--- a/kutils/kcmultidialog.cpp
+++ b/kutils/kcmultidialog.cpp
@@ -358,7 +358,7 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page)
if( ! obj )
return;
- KCModuleProxy * module = ( KCModuleProxy* )obj->tqqt_cast(
+ KCModuleProxy * module = ( KCModuleProxy* )obj->qt_cast(
"KCModuleProxy" );
if( ! module )
return;
diff --git a/kutils/kfinddialog.cpp b/kutils/kfinddialog.cpp
index c23380696..bd5401c06 100644
--- a/kutils/kfinddialog.cpp
+++ b/kutils/kfinddialog.cpp
@@ -429,7 +429,7 @@ void KFindDialog::showPatterns()
if ( d->m_regexpDialog )
{
- KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( d->m_regexpDialog->tqqt_cast( "KRegExpEditorInterface" ) );
+ KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( d->m_regexpDialog->qt_cast( "KRegExpEditorInterface" ) );
assert( iface );
iface->setRegExp( pattern() );
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index 96e853534..a9ff9db9b 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -696,7 +696,7 @@ void KPluginSelector::defaults()
// tabwidget - defaults() will be called for all of them)
TQWidget * pluginconfig = d->widgetstack->visibleWidget();
- KCModuleProxy * kcm = ( KCModuleProxy* )pluginconfig->tqqt_cast(
+ KCModuleProxy * kcm = ( KCModuleProxy* )pluginconfig->qt_cast(
"KCModuleProxy" );
if( kcm )
{