From 374d939d8af431477ce2601815f0ba121b66871c Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 15 Feb 2011 19:11:41 +0000 Subject: Allow kdelibs to function correctly with TQt for Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1220926 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kparts/browserextension.cpp | 2 +- kparts/componentfactory.h | 6 +++--- kparts/dockmainwindow.cpp | 4 ++-- kparts/factory.cpp | 2 +- kparts/genericfactory.h | 6 +++--- kparts/mainwindow.cpp | 4 ++-- kparts/partmanager.h | 2 +- kparts/statusbarextension.cpp | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'kparts') diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp index 81aa4fb52..f014255b4 100644 --- a/kparts/browserextension.cpp +++ b/kparts/browserextension.cpp @@ -452,7 +452,7 @@ void BrowserExtension::slotCompleted() void BrowserExtension::pasteRequest() { TQCString plain( "plain" ); - TQString url = TQApplication::tqclipboard()->tqtext(plain, TQClipboard::Selection).stripWhiteSpace(); + TQString url = TQApplication::tqclipboard()->text(plain, TQClipboard::Selection).stripWhiteSpace(); // Remove linefeeds and any whitespace surrounding it. url.remove(TQRegExp("[\\ ]*\\n+[\\ ]*")); diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h index 80661b191..64feac1c8 100644 --- a/kparts/componentfactory.h +++ b/kparts/componentfactory.h @@ -66,7 +66,7 @@ namespace KParts T::tqstaticMetaObject()->className(), args ); - T *result = dynamic_cast( static_cast(object) ); + T *result = tqt_dynamic_cast( object ); if ( !result ) delete object; return result; @@ -104,7 +104,7 @@ namespace KParts T::tqstaticMetaObject()->className(), args ); - T *result = dynamic_cast( object ); + T *result = tqt_dynamic_cast( object ); if ( !result ) delete object; return result; @@ -178,7 +178,7 @@ namespace KParts *error = ErrNoFactory; return 0; } - KParts::Factory *partFactory = dynamic_cast( factory ); + KParts::Factory *partFactory = tqt_dynamic_cast( factory ); if ( !partFactory ) { library->unload(); diff --git a/kparts/dockmainwindow.cpp b/kparts/dockmainwindow.cpp index 9f7703ab6..461bc0ec3 100644 --- a/kparts/dockmainwindow.cpp +++ b/kparts/dockmainwindow.cpp @@ -76,7 +76,7 @@ void DockMainWindow::createGUI( Part * part ) KXMLGUIFactory *factory = guiFactory(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); TQPtrList plugins; @@ -117,7 +117,7 @@ void DockMainWindow::createGUI( Part * part ) } - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); d->m_activePart = part; } diff --git a/kparts/factory.cpp b/kparts/factory.cpp index fc33feccf..092d550d1 100644 --- a/kparts/factory.cpp +++ b/kparts/factory.cpp @@ -63,7 +63,7 @@ const KInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName KLibFactory *factory = library->factory(); if ( !factory ) return 0; - KParts::Factory *pfactory = dynamic_cast( factory ); + KParts::Factory *pfactory = tqt_dynamic_cast( factory ); if ( !pfactory ) return 0; return pfactory->partInstance(); diff --git a/kparts/genericfactory.h b/kparts/genericfactory.h index 99ce7c3be..241943fcb 100644 --- a/kparts/genericfactory.h +++ b/kparts/genericfactory.h @@ -111,7 +111,7 @@ namespace KParts if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) ) { - KParts::ReadWritePart *rwp = dynamic_cast( part ); + KParts::ReadWritePart *rwp = tqt_dynamic_cast( part ); if ( rwp ) rwp->setReadWrite( false ); } @@ -137,11 +137,11 @@ namespace KParts args ); // (this cast is guaranteed to work...) - KParts::Part *part = dynamic_cast( object ); + KParts::Part *part = tqt_dynamic_cast( object ); if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) ) { - KParts::ReadWritePart *rwp = dynamic_cast( part ); + KParts::ReadWritePart *rwp = tqt_dynamic_cast( part ); if ( rwp ) rwp->setReadWrite( false ); } diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp index c0c4cd086..facc5a0ec 100644 --- a/kparts/mainwindow.cpp +++ b/kparts/mainwindow.cpp @@ -93,7 +93,7 @@ void MainWindow::createGUI( Part * part ) assert( factory ); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); TQPtrList plugins; @@ -137,7 +137,7 @@ void MainWindow::createGUI( Part * part ) applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); } - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); d->m_activePart = part; } diff --git a/kparts/partmanager.h b/kparts/partmanager.h index 83bd975b2..ca1ccfea0 100644 --- a/kparts/partmanager.h +++ b/kparts/partmanager.h @@ -131,7 +131,7 @@ public: /** * Specifies which mouse buttons the partmanager should react upon. * By default it reacts on all mouse buttons (LMB/MMB/RMB). - * @param buttonMask a combination of Qt::ButtonState values e.g. Qt::LeftButton | Qt::MidButton + * @param buttonMask a combination of TQt::ButtonState values e.g. Qt::LeftButton | Qt::MidButton */ void setActivationButtonMask( short int buttonMask ); /** diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp index c3277752d..f7da19fec 100644 --- a/kparts/statusbarextension.cpp +++ b/kparts/statusbarextension.cpp @@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const { if ( !m_statusBar ) { TQWidget* w = static_cast(parent())->widget(); - KMainWindow* mw = dynamic_cast( w->tqtopLevelWidget() ); + KMainWindow* mw = tqt_dynamic_cast( w->tqtopLevelWidget() ); if ( mw ) m_statusBar = mw->statusBar(); } -- cgit v1.2.1