diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
tree | 30834aa632d442019e14f88685001d94657d060b /interfaces | |
parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'interfaces')
48 files changed, 73 insertions, 73 deletions
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index dc0a9dca5..5acb9a259 100644 --- a/interfaces/khexedit/byteseditinterface.h +++ b/interfaces/khexedit/byteseditinterface.h @@ -143,8 +143,8 @@ class BytesEditInterface virtual bool isModified() const = 0; public: // call for action - /** repaint the indizes from i1 to i2 */ - virtual void repaintRange( int i1, int i2 ) = 0; + /** tqrepaint the indizes from i1 to i2 */ + virtual void tqrepaintRange( int i1, int i2 ) = 0; }; @@ -159,7 +159,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) if( !t ) return 0; - return static_cast<BytesEditInterface*>( t->qt_cast("KHE::BytesEditInterface") ); + return static_cast<BytesEditInterface*>( t->tqqt_cast("KHE::BytesEditInterface") ); } /** tries to create an instance of a hexedit widget for arrays of chars (char[]) @@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 ) { return KParts::ComponentFactory::createInstanceFromQuery<TQWidget> - ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name ); + ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name ); } } diff --git a/interfaces/khexedit/charcolumninterface.h b/interfaces/khexedit/charcolumninterface.h index 4221de0c4..753ff7ab1 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->qt_cast("KHE::CharColumnInterface") ); + return static_cast<CharColumnInterface*>( t->tqqt_cast("KHE::CharColumnInterface") ); } } diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h index eeaf9d391..0e106aa32 100644 --- a/interfaces/khexedit/clipboardinterface.h +++ b/interfaces/khexedit/clipboardinterface.h @@ -78,7 +78,7 @@ ClipboardInterface *clipboardInterface( T *t ) if( !t ) return 0; - return static_cast<ClipboardInterface*>( t->qt_cast("KHE::ClipboardInterface") ); + return static_cast<ClipboardInterface*>( t->tqqt_cast("KHE::ClipboardInterface") ); } } diff --git a/interfaces/khexedit/valuecolumninterface.h b/interfaces/khexedit/valuecolumninterface.h index 7dafa7d42..e23c91761 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->qt_cast("KHE::ValueColumnInterface") ); + return static_cast<ValueColumnInterface*>( t->tqqt_cast("KHE::ValueColumnInterface") ); } } diff --git a/interfaces/khexedit/zoominterface.h b/interfaces/khexedit/zoominterface.h index 494fbfd86..5fdaa8c24 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->qt_cast("KHE::ZoomInterface") ); + return static_cast<ZoomInterface*>( t->tqqt_cast("KHE::ZoomInterface") ); } } diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h index f3212df6d..a41172fdf 100644 --- a/interfaces/kimproxy/interface/kimiface.h +++ b/interfaces/kimproxy/interface/kimiface.h @@ -467,7 +467,7 @@ k_dcop_signals: /** * @brief Indicates that a contact's presence has changed * - * Notifies connected DCOP receivers about a change in a contact's + * Notifies connected DCOP tqreceivers about a change in a contact's * presence. * * Implementations just have to call this method with the appropriate diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp index 44f828a02..38462a158 100644 --- a/interfaces/kimproxy/library/kimproxy.cpp +++ b/interfaces/kimproxy/library/kimproxy.cpp @@ -248,7 +248,7 @@ bool KIMProxy::initialize() { m_apps_available = true; //kdDebug( 790 ) << " app name: " << (*offer)->name() << ", has instance " << *app << ", dcopService: " << dcopService << endl; - if ( !m_im_client_stubs.find( dcopService ) ) + if ( !m_im_client_stubs.tqfind( dcopService ) ) { kdDebug( 790 ) << "App " << *app << ", dcopObjectId " << dcopObjectId << " found, using it for presence info." << endl; m_im_client_stubs.insert( *app, new KIMIface_stub( d->dc, *app, dcopObjectId ) ); @@ -284,7 +284,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId ) if ( appId.left( dcopService.length() ) == dcopService ) { // if it's not already known, insert it - if ( !m_im_client_stubs.find( appId ) ) + if ( !m_im_client_stubs.tqfind( appId ) ) { newApp = true; kdDebug( 790 ) << "App: " << appId << ", dcopService: " << dcopService << " started, using it for presence info."<< endl; @@ -301,7 +301,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId ) void KIMProxy::unregisteredFromDCOP( const TQCString& appId ) { //kdDebug( 790 ) << k_funcinfo << appId << endl; - if ( m_im_client_stubs.find( appId ) ) + if ( m_im_client_stubs.tqfind( appId ) ) { kdDebug( 790 ) << appId << " quit, removing its presence info." << endl; @@ -618,7 +618,7 @@ KIMIface_stub * KIMProxy::stubForUid( const TQString &uid ) // get best appPresence AppPresenceCurrent ap = d->presence_map[ uid ].best(); // look up the presence string from that app - return m_im_client_stubs.find( ap.appId ); + return m_im_client_stubs.tqfind( ap.appId ); } KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol) @@ -626,7 +626,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol) KIMIface_stub * app; // see if the preferred client supports this protocol TQString preferred = preferredApp(); - if ( ( app = m_im_client_stubs.find( preferred ) ) ) + if ( ( app = m_im_client_stubs.tqfind( preferred ) ) ) { if ( app->protocols().grep( protocol ).count() > 0 ) return app; diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index 11fa58f27..0ce32c6cd 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -83,7 +83,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) { TQHBox *frame = new TQHBox( box ); frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + frame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); view->videoWidget()->reparent( frame, TQPoint(0,0) ); } @@ -110,7 +110,7 @@ void KFileAudioPreview::showPreview( const KURL &url ) return; KMimeType::Ptr mt = KMimeType::findByURL( url ); - bool supported = m_supportedFormats.find( mt->name() ); + bool supported = m_supportedFormats.tqfind( mt->name() ); d->player->view()->setEnabled( supported ); if ( !supported ) return; diff --git a/interfaces/kmediaplayer/player.h b/interfaces/kmediaplayer/player.h index 10e9f4a74..32990840e 100644 --- a/interfaces/kmediaplayer/player.h +++ b/interfaces/kmediaplayer/player.h @@ -56,7 +56,7 @@ public: /** This constructor is what to use when a GUI is required, as in the * case of a KMediaPlayer/Player. */ - Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name); + Player(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name); virtual ~Player(void); diff --git a/interfaces/kmediaplayer/view.h b/interfaces/kmediaplayer/view.h index 54f46a8ca..ae6ee2ea2 100644 --- a/interfaces/kmediaplayer/view.h +++ b/interfaces/kmediaplayer/view.h @@ -31,7 +31,7 @@ namespace KMediaPlayer { /** View is part of the user interface of a Player. */ -class KDE_EXPORT View : public QWidget +class KDE_EXPORT View : public TQWidget { Q_OBJECT diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h index 01fab0fdf..c10b86ea9 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->qt_cast( "KRegExpEditorInterface" ) ); + * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->tqqt_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->qt_cast( "KRegExpEditorInterface" ) ); + * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->tqqt_cast( "KRegExpEditorInterface" ) ); * Q_ASSERT( editor ); // This should not fail! * * // now use the editor. diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/kscript/scriptinterface.h index e711e82ca..1c37b7f71 100644 --- a/interfaces/kscript/scriptinterface.h +++ b/interfaces/kscript/scriptinterface.h @@ -44,7 +44,7 @@ class KScriptClientInterface; * @author Ian Reinhart Geiser <geiseri@kde.org> * **/ - class KDE_EXPORT KScriptInterface : public QObject + class KDE_EXPORT KScriptInterface : public TQObject { Q_OBJECT public: diff --git a/interfaces/ktexteditor/blockselectioninterface.cpp b/interfaces/ktexteditor/blockselectioninterface.cpp index c1af4a6ed..af3372829 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->qt_cast("KTextEditor::BlockSelectionInterface")); + return static_cast<BlockSelectionInterface*>(doc->tqqt_cast("KTextEditor::BlockSelectionInterface")); } diff --git a/interfaces/ktexteditor/clipboardinterface.cpp b/interfaces/ktexteditor/clipboardinterface.cpp index 4401b29de..c1bc2803f 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->qt_cast("KTextEditor::ClipboardInterface")); + return static_cast<ClipboardInterface*>(view->tqqt_cast("KTextEditor::ClipboardInterface")); } diff --git a/interfaces/ktexteditor/codecompletioninterface.cpp b/interfaces/ktexteditor/codecompletioninterface.cpp index ae60b2162..1d185a629 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->qt_cast("KTextEditor::CodeCompletionInterface")); + return static_cast<CodeCompletionInterface*>(view->tqqt_cast("KTextEditor::CodeCompletionInterface")); } diff --git a/interfaces/ktexteditor/configinterface.cpp b/interfaces/ktexteditor/configinterface.cpp index 2ca2e4b12..7a88261c9 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->qt_cast("KTextEditor::ConfigInterface")); + return static_cast<ConfigInterface*>(doc->tqqt_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->qt_cast("KTextEditor::ConfigInterface")); + return static_cast<ConfigInterface*>(plugin->tqqt_cast("KTextEditor::ConfigInterface")); } diff --git a/interfaces/ktexteditor/configinterfaceextension.cpp b/interfaces/ktexteditor/configinterfaceextension.cpp index 8557c422f..fe4704d44 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->qt_cast("KTextEditor::ConfigInterfaceExtension")); + return static_cast<ConfigInterfaceExtension*>(doc->tqqt_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->qt_cast("KTextEditor::ConfigInterfaceExtension")); + return static_cast<ConfigInterfaceExtension*>(plugin->tqqt_cast("KTextEditor::ConfigInterfaceExtension")); } diff --git a/interfaces/ktexteditor/configinterfaceextension.h b/interfaces/ktexteditor/configinterfaceextension.h index 6ebfd8895..e324e2ba2 100644 --- a/interfaces/ktexteditor/configinterfaceextension.h +++ b/interfaces/ktexteditor/configinterfaceextension.h @@ -26,7 +26,7 @@ namespace KTextEditor { -class KTEXTEDITOR_EXPORT ConfigPage : public QWidget +class KTEXTEDITOR_EXPORT ConfigPage : public TQWidget { Q_OBJECT diff --git a/interfaces/ktexteditor/cursorinterface.cpp b/interfaces/ktexteditor/cursorinterface.cpp index 91a14b06a..3b7857bbb 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->qt_cast("KTextEditor::CursorInterface")); + return static_cast<CursorInterface*>(doc->tqqt_cast("KTextEditor::CursorInterface")); } diff --git a/interfaces/ktexteditor/dynwordwrapinterface.cpp b/interfaces/ktexteditor/dynwordwrapinterface.cpp index 49d4060c0..a60f1129b 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->qt_cast("KTextEditor::DynWordWrapInterface")); + return static_cast<DynWordWrapInterface*>(view->tqqt_cast("KTextEditor::DynWordWrapInterface")); } diff --git a/interfaces/ktexteditor/editinterface.cpp b/interfaces/ktexteditor/editinterface.cpp index 6722fc555..3a03002b2 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->qt_cast("KTextEditor::EditInterface")); + return static_cast<EditInterface*>(doc->tqqt_cast("KTextEditor::EditInterface")); } diff --git a/interfaces/ktexteditor/editinterfaceext.cpp b/interfaces/ktexteditor/editinterfaceext.cpp index 7d4acf55f..944b662d9 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->qt_cast("KTextEditor::EditInterfaceExt")); + return static_cast<EditInterfaceExt*>(doc->tqqt_cast("KTextEditor::EditInterfaceExt")); } diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h index 650bb9ec2..e5f2d9101 100644 --- a/interfaces/ktexteditor/editinterfaceext.h +++ b/interfaces/ktexteditor/editinterfaceext.h @@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt /** * Begin an editing sequence. Edit commands during this sequence will be * bunched together such that they represent a single undo command in the - * editor, and so that repaint events do not occur inbetween. + * editor, and so that tqrepaint events do not occur inbetween. * * Your application should not return control to the event loop while it * has an unterminated (no matching editEnd() call) editing sequence diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h index 11f9a8c15..fa4761432 100644 --- a/interfaces/ktexteditor/editor.h +++ b/interfaces/ktexteditor/editor.h @@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart unsigned int myEditorNumber; }; -KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 ); +KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 ); } diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp index 96cf3649e..60aef8d10 100644 --- a/interfaces/ktexteditor/editorchooser.cpp +++ b/interfaces/ktexteditor/editorchooser.cpp @@ -130,7 +130,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char return 0; } -KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName, +KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName, const char* name,const TQString& postfix,bool fallBackToKatePart){ KTextEditor::Editor *tmpEd=0; @@ -151,11 +151,11 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject KService::Ptr serv=KService::serviceByDesktopName(editor); if (serv) { - tmpEd=KTextEditor::createEditor(serv->library().latin1(),parentWidget,widgetName,parent,name); + tmpEd=KTextEditor::createEditor(serv->library().latin1(),tqparentWidget,widgetName,parent,name); if (tmpEd) return tmpEd; } if (fallBackToKatePart) - return KTextEditor::createEditor("libkatepart",parentWidget,widgetName,parent,name); + return KTextEditor::createEditor("libkatepart",tqparentWidget,widgetName,parent,name); return 0; } diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h index 20fba94e1..a5118c3d4 100644 --- a/interfaces/ktexteditor/editorchooser.h +++ b/interfaces/ktexteditor/editorchooser.h @@ -12,7 +12,7 @@ class TQString; namespace KTextEditor { -class KTEXTEDITOR_EXPORT EditorChooser: public QWidget +class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget { friend class PrivateEditorChooser; @@ -28,7 +28,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public QWidget void writeAppSetting(const TQString& postfix=TQString::null); static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true); - static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true); + static KTextEditor::Editor *createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true); private: class PrivateEditorChooser *d; }; diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui index fa1d99184..831d8d37a 100644 --- a/interfaces/ktexteditor/editorchooser_ui.ui +++ b/interfaces/ktexteditor/editorchooser_ui.ui @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>460</width> <height>0</height> @@ -40,7 +40,7 @@ <property name="text"> <string>Please choose the default text editing component that you wish to use in this application. If you choose <B>System Default</B>, the application will honor your changes in the Control Center. All other choices will override that setting.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> </widget> diff --git a/interfaces/ktexteditor/encodinginterface.cpp b/interfaces/ktexteditor/encodinginterface.cpp index 341847fb7..e864525e0 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->qt_cast("KTextEditor::EncodingInterface")); + return static_cast<EncodingInterface*>(doc->tqqt_cast("KTextEditor::EncodingInterface")); } diff --git a/interfaces/ktexteditor/highlightinginterface.cpp b/interfaces/ktexteditor/highlightinginterface.cpp index f606ab5c0..188545079 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->qt_cast("KTextEditor::HighlightingInterface")); + return static_cast<HighlightingInterface*>(doc->tqqt_cast("KTextEditor::HighlightingInterface")); } diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp index 0b50fdaeb..09bd63ea9 100644 --- a/interfaces/ktexteditor/ktexteditor.cpp +++ b/interfaces/ktexteditor/ktexteditor.cpp @@ -206,9 +206,9 @@ unsigned int Editor::editorNumber () const return myEditorNumber; } -Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) +Editor *KTextEditor::createEditor ( const char* libname, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name ) { - return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name ); + return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, tqparentWidget, widgetName, parent, name ); } Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name ) @@ -226,6 +226,6 @@ PluginViewInterface *KTextEditor::pluginViewInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast<PluginViewInterface*>(plugin->qt_cast("KTextEditor::PluginViewInterface")); + return static_cast<PluginViewInterface*>(plugin->tqqt_cast("KTextEditor::PluginViewInterface")); } diff --git a/interfaces/ktexteditor/markinterface.cpp b/interfaces/ktexteditor/markinterface.cpp index d711b5245..97c23f1e7 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->qt_cast("KTextEditor::MarkInterface")); + return static_cast<MarkInterface*>(doc->tqqt_cast("KTextEditor::MarkInterface")); } int MarkInterface::reservedMarkersCount() diff --git a/interfaces/ktexteditor/markinterfaceextension.cpp b/interfaces/ktexteditor/markinterfaceextension.cpp index 57c981421..19b327e96 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->qt_cast("KTextEditor::MarkInterfaceExtension")); + return static_cast<MarkInterfaceExtension*>(doc->tqqt_cast("KTextEditor::MarkInterfaceExtension")); } diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/ktexteditor/plugin.h index dc7978f92..71266d3e2 100644 --- a/interfaces/ktexteditor/plugin.h +++ b/interfaces/ktexteditor/plugin.h @@ -33,7 +33,7 @@ class View; * Basic KTextEditor plugin class. * This plugin will be bound to a Document. */ -class KTEXTEDITOR_EXPORT Plugin : public QObject +class KTEXTEDITOR_EXPORT Plugin : public TQObject { friend class PrivatePlugin; diff --git a/interfaces/ktexteditor/popupmenuinterface.cpp b/interfaces/ktexteditor/popupmenuinterface.cpp index d2d51e4af..6de6f201c 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->qt_cast("KTextEditor::PopupMenuInterface")); + return static_cast<PopupMenuInterface*>(view->tqqt_cast("KTextEditor::PopupMenuInterface")); } diff --git a/interfaces/ktexteditor/printinterface.cpp b/interfaces/ktexteditor/printinterface.cpp index 936e803ea..0f6c6afd8 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->qt_cast("KTextEditor::PrintInterface")); + return static_cast<PrintInterface*>(doc->tqqt_cast("KTextEditor::PrintInterface")); } diff --git a/interfaces/ktexteditor/searchinterface.cpp b/interfaces/ktexteditor/searchinterface.cpp index d23a25e31..e1a58ed6b 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->qt_cast("KTextEditor::SearchInterface")); + return static_cast<SearchInterface*>(doc->tqqt_cast("KTextEditor::SearchInterface")); } diff --git a/interfaces/ktexteditor/selectioninterface.cpp b/interfaces/ktexteditor/selectioninterface.cpp index 2e9ae5204..61bc7a995 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->qt_cast("KTextEditor::SelectionInterface")); + return static_cast<SelectionInterface*>(doc->tqqt_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->qt_cast("KTextEditor::SelectionInterface")); + return static_cast<SelectionInterface*>(view->tqqt_cast("KTextEditor::SelectionInterface")); } diff --git a/interfaces/ktexteditor/selectioninterfaceext.cpp b/interfaces/ktexteditor/selectioninterfaceext.cpp index f59468c17..c8404a9b5 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->qt_cast("KTextEditor::SelectionInterfaceExt")); + return static_cast<SelectionInterfaceExt*>(doc->tqqt_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->qt_cast("KTextEditor::SelectionInterfaceExt")); + return static_cast<SelectionInterfaceExt*>(view->tqqt_cast("KTextEditor::SelectionInterfaceExt")); } //END KTextEditor::SelectionInterfaceExt diff --git a/interfaces/ktexteditor/sessionconfiginterface.cpp b/interfaces/ktexteditor/sessionconfiginterface.cpp index 7180aae38..1720584cc 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->qt_cast("KTextEditor::SessionConfigInterface")); + return static_cast<SessionConfigInterface*>(doc->tqqt_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->qt_cast("KTextEditor::SessionConfigInterface")); + return static_cast<SessionConfigInterface*>(view->tqqt_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->qt_cast("KTextEditor::SessionConfigInterface")); + return static_cast<SessionConfigInterface*>(plugin->tqqt_cast("KTextEditor::SessionConfigInterface")); } diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp index 4f9f83706..b19b1d10a 100644 --- a/interfaces/ktexteditor/templateinterface.cpp +++ b/interfaces/ktexteditor/templateinterface.cpp @@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget * { KABC::StdAddressBook *addrBook = 0; KABC::Addressee userAddress; - TQDateTime datetime = TQDateTime::currentDateTime(); + TQDateTime datetime = TQDateTime::tqcurrentDateTime(); TQDate date = datetime.date(); TQTime time = datetime.time(); @@ -192,6 +192,6 @@ TemplateInterface *KTextEditor::templateInterface ( KTextEditor::Document *doc ) if ( !doc ) return 0; - return static_cast<TemplateInterface*>( doc->qt_cast( "KTextEditor::TemplateInterface" ) ); + return static_cast<TemplateInterface*>( doc->tqqt_cast( "KTextEditor::TemplateInterface" ) ); } diff --git a/interfaces/ktexteditor/texthintinterface.cpp b/interfaces/ktexteditor/texthintinterface.cpp index 079a1edda..3a6c3a759 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->qt_cast("KTextEditor::TextHintInterface")); + return static_cast<TextHintInterface*>(view->tqqt_cast("KTextEditor::TextHintInterface")); } diff --git a/interfaces/ktexteditor/undointerface.cpp b/interfaces/ktexteditor/undointerface.cpp index d19a56deb..c86a3ecf2 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->qt_cast("KTextEditor::UndoInterface")); + return static_cast<UndoInterface*>(doc->tqqt_cast("KTextEditor::UndoInterface")); } diff --git a/interfaces/ktexteditor/variableinterface.cpp b/interfaces/ktexteditor/variableinterface.cpp index 0ac55167e..f8bfcfe91 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->qt_cast("KTextEditor::VariableInterface")); + return static_cast<VariableInterface*>(doc->tqqt_cast("KTextEditor::VariableInterface")); } diff --git a/interfaces/ktexteditor/viewcursorinterface.cpp b/interfaces/ktexteditor/viewcursorinterface.cpp index 0c834be42..dd718a7dd 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->qt_cast("KTextEditor::ViewCursorInterface")); + return static_cast<ViewCursorInterface*>(view->tqqt_cast("KTextEditor::ViewCursorInterface")); } diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/ktexteditor/viewstatusmsginterface.cpp index ff0815c89..643e2e798 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->qt_cast("KTextEditor::ViewStatusMsgInterface")); + return static_cast<ViewStatusMsgInterface*>(view->tqqt_cast("KTextEditor::ViewStatusMsgInterface")); } diff --git a/interfaces/ktexteditor/wordwrapinterface.cpp b/interfaces/ktexteditor/wordwrapinterface.cpp index 3afe5c230..ff6d17362 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->qt_cast("KTextEditor::WordWrapInterface")); + return static_cast<WordWrapInterface*>(doc->tqqt_cast("KTextEditor::WordWrapInterface")); } diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index 450d1e27d..0e3acb22f 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->qt_cast( "TerminalInterface" ) ); + * TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_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 be3f4165e..905eedbb6 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->qt_cast( "TerminalInterface" ) ); + TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_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->qt_cast( "TerminalInterface" ) ) << std::endl; + std::cerr << ( p->tqqt_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->qt_cast( "TerminalInterface" ) ); + TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) ); TQStrList l; l.append( "echo" ); l.append( "hello world" ); |