diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kicker/kicker/core/pluginmanager.cpp | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/kicker/core/pluginmanager.cpp')
| -rw-r--r-- | kicker/kicker/core/pluginmanager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index 81975ccae..86270db62 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -159,7 +159,7 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { - _dict.insert( applet, new AppletInfo( info ) ); + _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) ); connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } @@ -197,7 +197,7 @@ KPanelExtension* PluginManager::loadExtension( KPanelExtension* extension = init_ptr( parent, info.configFile() ); if( extension ) { - _dict.insert( extension, new AppletInfo( info ) ); + _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) ); connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } @@ -272,7 +272,7 @@ AppletContainer* PluginManager::createAppletContainer( return 0; } - bool untrusted = m_untrustedApplets.find(desktopFile) != m_untrustedApplets.end(); + bool untrusted = m_untrustedApplets.tqfind(desktopFile) != m_untrustedApplets.end(); if (isStartup && untrusted) { // don't load extensions that bombed on us previously! @@ -325,7 +325,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk if (!internal) { - bool untrusted = m_untrustedExtensions.find(desktopFile) != m_untrustedExtensions.end(); + bool untrusted = m_untrustedExtensions.tqfind(desktopFile) != m_untrustedExtensions.end(); if (isStartup && untrusted) { // don't load extensions that bombed on us previously! @@ -365,7 +365,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) void LibUnloader::unload( const TQString &libName ) { - (void)new LibUnloader( libName, kapp ); + (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) ); } void LibUnloader::unload() |