From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdepim/komposer/core/core.h | 2 +- libkdepim/komposer/core/pluginmanager.cpp | 28 +++++++++++++-------------- libkdepim/komposer/core/prefsmodule.cpp | 10 +++++----- libkdepim/komposer/core/tests/testmanager.cpp | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'libkdepim/komposer/core') diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h index 7d004c962..91ef133e9 100644 --- a/libkdepim/komposer/core/core.h +++ b/libkdepim/komposer/core/core.h @@ -46,7 +46,7 @@ namespace Komposer { Q_OBJECT public: - Core( TQWidget *parentWidget = 0, const char *name = 0 ); + Core( TQWidget *tqparentWidget = 0, const char *name = 0 ); virtual ~Core(); public slots: diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp index c7cf74927..d4fd5acc8 100644 --- a/libkdepim/komposer/core/pluginmanager.cpp +++ b/libkdepim/komposer/core/pluginmanager.cpp @@ -82,8 +82,8 @@ PluginManager::PluginManager( TQObject *parent ) this, TQT_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( - KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), - TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) ); + KTrader::self()->query( TQString::tqfromLatin1( "Komposer/Plugin" ), + TQString::tqfromLatin1( "[X-Komposer-Version] == 1" ) ) ); } PluginManager::~PluginManager() @@ -205,7 +205,7 @@ PluginManager::slotShutdownTimeout() kdWarning() << k_funcinfo << "Some plugins didn't shutdown in time!" << endl << "Remaining plugins: " - << remaining.join( TQString::fromLatin1( ", " ) ) << endl + << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl << "Forcing Komposer shutdown now." << endl; #endif @@ -229,18 +229,18 @@ PluginManager::loadAllPlugins() d->config = KSharedConfig::openConfig( "komposerrc" ); TQMap entries = d->config->entryMap( - TQString::fromLatin1( "Plugins" ) ); + TQString::tqfromLatin1( "Plugins" ) ); TQMap::Iterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { TQString key = it.key(); - if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) ) + if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) ) { key.setLength( key.length() - 7 ); //kdDebug() << k_funcinfo << "Set " << key << " to " << it.data() << endl; - if ( it.data() == TQString::fromLatin1( "true" ) ) + if ( it.data() == TQString::tqfromLatin1( "true" ) ) { if ( !plugin( key ) ) d->pluginsToLoad.push( key ); @@ -305,13 +305,13 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) return 0; } - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; int error = 0; Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery( - TQString::fromLatin1( "Komposer/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), + TQString::tqfromLatin1( "Komposer/Plugin" ), + TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { @@ -408,7 +408,7 @@ PluginManager::plugin( const TQString &pluginId ) const if ( !info ) return 0; - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; else return 0; @@ -424,7 +424,7 @@ PluginManager::pluginName( const Plugin *plugin ) const return it.key()->name(); } - return TQString::fromLatin1( "Unknown" ); + return TQString::tqfromLatin1( "Unknown" ); } QString @@ -437,7 +437,7 @@ PluginManager::pluginId( const Plugin *plugin ) const return it.key()->pluginName(); } - return TQString::fromLatin1( "unknown" ); + return TQString::tqfromLatin1( "unknown" ); } QString @@ -450,7 +450,7 @@ PluginManager::pluginIcon( const Plugin *plugin ) const return it.key()->icon(); } - return TQString::fromLatin1( "Unknown" ); + return TQString::tqfromLatin1( "Unknown" ); } KPluginInfo* @@ -478,7 +478,7 @@ PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = tru if ( !infoForPluginId( pluginId ) ) return false; - d->config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled ); + d->config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled ); d->config->sync(); return true; diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp index 7dd1673e9..3536ebb8e 100644 --- a/libkdepim/komposer/core/prefsmodule.cpp +++ b/libkdepim/komposer/core/prefsmodule.cpp @@ -75,8 +75,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, : m_reference( reference ) { m_box = new TQGroupBox( 0, Qt::Vertical, text, parent ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() ); - boxLayout->setAlignment( Qt::AlignTop ); + TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); + boxLayout->tqsetAlignment( Qt::AlignTop ); m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); @@ -101,16 +101,16 @@ EditorSelection::readConfig() m_editorsCombo->clear(); KTrader::OfferList editors = KTrader::self()->query( - TQString::fromLatin1( "Komposer/Editor" ) ); + TQString::tqfromLatin1( "Komposer/Editor" ) ); KTrader::OfferList::ConstIterator it; int i = 0; for ( it = editors.begin(); it != editors.end(); ++it, ++i ) { - if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) ) + if ( !(*it)->hasServiceType( TQString::tqfromLatin1( "Komposer/Editor" ) ) ) continue; TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString(); m_editorsCombo->insertItem( name ); - if ( m_reference.contains( name ) ) + if ( m_reference.tqcontains( name ) ) m_editorsCombo->setCurrentItem( i ); } } diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp index 8895cfe9e..0fcba16b9 100644 --- a/libkdepim/komposer/core/tests/testmanager.cpp +++ b/libkdepim/komposer/core/tests/testmanager.cpp @@ -34,7 +34,7 @@ void TestManager::slotAllPluginsLoaded() { kdDebug()<<"Done"<shutdown(); - qApp->exit(); + tqApp->exit(); } void TestManager::slotPluginLoaded( Plugin *plugin ) -- cgit v1.2.1