diff options
Diffstat (limited to 'kmrml/kmrml/lib')
| -rw-r--r-- | kmrml/kmrml/lib/kmrml_config.cpp | 62 | ||||
| -rw-r--r-- | kmrml/kmrml/lib/kmrml_config.h | 46 | ||||
| -rw-r--r-- | kmrml/kmrml/lib/mrml_shared.cpp | 220 | ||||
| -rw-r--r-- | kmrml/kmrml/lib/mrml_shared.h | 220 | ||||
| -rw-r--r-- | kmrml/kmrml/lib/mrml_utils.h | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/lib/watcher_stub.cpp | 38 | ||||
| -rw-r--r-- | kmrml/kmrml/lib/watcher_stub.h | 22 |
7 files changed, 305 insertions, 305 deletions
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index a88e8404..6358971d 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -16,9 +16,9 @@ Boston, MA 02110-1301, USA. */ -#include <qdir.h> -#include <qfile.h> -#include <qtextcodec.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqtextcodec.h> #include <kconfig.h> #include <kdebug.h> @@ -101,10 +101,10 @@ bool Config::sync() // KIO::SlaveConfig::self()->reset(); } -void Config::setDefaultHost( const QString& host ) +void Config::setDefaultHost( const TQString& host ) { m_defaultHost = host.isEmpty() ? - QString::fromLatin1(DEFAULT_HOST) : host; + TQString::fromLatin1(DEFAULT_HOST) : host; m_config->setGroup( CONFIG_GROUP ); m_config->writeEntry( "Default Host", m_defaultHost ); @@ -115,7 +115,7 @@ ServerSettings Config::settingsForLocalHost() const return settingsForHost( "localhost" ); } -ServerSettings Config::settingsForHost( const QString& host ) const +ServerSettings Config::settingsForHost( const TQString& host ) const { KConfigGroup config( m_config, settingsGroup( host ) ); ServerSettings settings; @@ -136,7 +136,7 @@ ServerSettings Config::settingsForHost( const QString& host ) const void Config::addSettings( const ServerSettings& settings ) { - QString host = settings.host; + TQString host = settings.host; if ( m_hostList.find( host ) == m_hostList.end() ) m_hostList.append( host ); @@ -152,7 +152,7 @@ void Config::addSettings( const ServerSettings& settings ) m_config->writeEntry( "Perform Authentication", settings.useAuth ); } -bool Config::removeSettings( const QString& host ) +bool Config::removeSettings( const TQString& host ) { bool success = m_config->deleteGroup( settingsGroup( host ) ); if ( success ) @@ -164,22 +164,22 @@ bool Config::removeSettings( const QString& host ) return success; } -QStringList Config::indexableDirectories() const +TQStringList Config::indexableDirectories() const { m_config->setGroup( CONFIG_GROUP ); return m_config->readListEntry( "Indexable Directories" ); } -void Config::setIndexableDirectories( const QStringList& dirs ) +void Config::setIndexableDirectories( const TQStringList& dirs ) { m_config->setGroup( CONFIG_GROUP ); m_config->writeEntry( "Indexable Directories", dirs ); } -QString Config::addCollectionCommandLine() const +TQString Config::addCollectionCommandLine() const { m_config->setGroup( CONFIG_GROUP ); - QString cmd = m_config->readEntry( "AddCollection Commandline", + TQString cmd = m_config->readEntry( "AddCollection Commandline", DEFAULT_ADDCOLLECTION_CMD ); int index = cmd.find( "%h" ); if ( index != -1 ) @@ -187,21 +187,21 @@ QString Config::addCollectionCommandLine() const index = cmd.find( "%e" ); if ( index != -1 ) - cmd.replace( index, 2, QTextCodec::codecForLocale()->mimeName() ); + cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() ); return cmd; } -void Config::setAddCollectionCommandLine( const QString& cmd ) +void Config::setAddCollectionCommandLine( const TQString& cmd ) { m_config->setGroup( CONFIG_GROUP ); m_config->writeEntry( "AddCollection Commandline", cmd ); } -QString Config::removeCollectionCommandLine() const +TQString Config::removeCollectionCommandLine() const { m_config->setGroup( CONFIG_GROUP ); - QString cmd = m_config->readEntry( "RemoveCollection Commandline", + TQString cmd = m_config->readEntry( "RemoveCollection Commandline", DEFAULT_REMOVECOLLECTION_CMD ); int index = cmd.find( "%h" ); if ( index != -1 ) @@ -209,23 +209,23 @@ QString Config::removeCollectionCommandLine() const index = cmd.find( "%e" ); if ( index != -1 ) - cmd.replace( index, 2, QTextCodec::codecForLocale()->mimeName() ); + cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() ); return cmd; } -void Config::setRemoveCollectionCommandLine( const QString& cmd ) +void Config::setRemoveCollectionCommandLine( const TQString& cmd ) { m_config->setGroup( CONFIG_GROUP ); m_config->writeEntry( "RemoveCollection Commandline", cmd ); } -QString Config::mrmldCommandline() const +TQString Config::mrmldCommandline() const { ServerSettings settings = settingsForLocalHost(); m_config->setGroup( CONFIG_GROUP ); - QString cmd = m_config->readEntry( "MrmmlDaemon Commandline", + TQString cmd = m_config->readEntry( "MrmmlDaemon Commandline", settings.autoPort ? DEFAULT_MRMLD_CMD_AUTOPORT : DEFAULT_MRMLD_CMD ); @@ -234,8 +234,8 @@ QString Config::mrmldCommandline() const int index = cmd.find( "%p" ); if ( index != -1 ) { - QString port = settings.autoPort ? - QString::null : QString::number( settings.configuredPort ); + TQString port = settings.autoPort ? + TQString::null : TQString::number( settings.configuredPort ); cmd.replace( index, 2, port ); } index = cmd.find( "%d" ); @@ -249,17 +249,17 @@ QString Config::mrmldCommandline() const return cmd; } -QString Config::mrmldDataDir() +TQString Config::mrmldDataDir() { - QString dir = KGlobal::dirs()->saveLocation( "data", + TQString dir = KGlobal::dirs()->saveLocation( "data", "kmrml/mrmld-data/" ); if ( dir.isEmpty() ) // fallback - dir = QDir::homeDirPath() + "/"; + dir = TQDir::homeDirPath() + "/"; return dir; } -void Config::setMrmldCommandLine( const QString& cmd ) +void Config::setMrmldCommandLine( const TQString& cmd ) { m_config->setGroup( CONFIG_GROUP ); m_config->writeEntry( "MrmmlDaemon Commandline", cmd ); @@ -275,9 +275,9 @@ ServerSettings::ServerSettings() { } -ServerSettings::ServerSettings( const QString& host, unsigned short int port, +ServerSettings::ServerSettings( const TQString& host, unsigned short int port, bool autoPort, bool useAuth, - const QString& user, const QString& pass ) + const TQString& user, const TQString& pass ) { this->host = host; this->configuredPort = port; @@ -316,11 +316,11 @@ unsigned short int ServerSettings::port() const { if ( autoPort ) { - QString portsFile = Config::mrmldDataDir() + "gift-port.txt"; - QFile file( portsFile ); + TQString portsFile = Config::mrmldDataDir() + "gift-port.txt"; + TQFile file( portsFile ); if ( file.open( IO_ReadOnly ) ) { - QString line; + TQString line; (void) file.readLine( line, 6 ); // qDebug("**** read: %s", line.latin1()); diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h index 3b6baa40..2208030a 100644 --- a/kmrml/kmrml/lib/kmrml_config.h +++ b/kmrml/kmrml/lib/kmrml_config.h @@ -21,7 +21,7 @@ class KConfig; -#include <qstringlist.h> +#include <tqstringlist.h> #include <kurl.h> namespace KMrml @@ -30,18 +30,18 @@ namespace KMrml { public: ServerSettings(); - ServerSettings(const QString& host, unsigned short int port, + ServerSettings(const TQString& host, unsigned short int port, bool autoPort, bool useAuth, const - QString& user, const QString& pass); + TQString& user, const TQString& pass); // does NOT set the port in the KURL object, if autoPort is selected // kio_mrml is going to determine itself (via ServerSettings::port()). // This deuglifies the mrml:/ url a bit (no port is shown) KURL getUrl() const; - QString host; - QString user; - QString pass; + TQString host; + TQString user; + TQString pass; unsigned short int configuredPort; bool autoPort :1; // only possible with host == localhost bool useAuth :1; @@ -68,52 +68,52 @@ namespace KMrml } ServerSettings settingsForLocalHost() const; - ServerSettings settingsForHost( const QString& host ) const; + ServerSettings settingsForHost( const TQString& host ) const; - void setDefaultHost( const QString& host ); + void setDefaultHost( const TQString& host ); /** * Indexed by the hostname -- ensures there are no dupes */ void addSettings( const ServerSettings& settings ); - bool removeSettings( const QString& host ); + bool removeSettings( const TQString& host ); - QStringList hosts() const { return m_hostList; } + TQStringList hosts() const { return m_hostList; } /** * The list of indexable directories -- only applicable to "localhost" */ - QStringList indexableDirectories() const; - void setIndexableDirectories( const QStringList& dirs ); + TQStringList indexableDirectories() const; + void setIndexableDirectories( const TQStringList& dirs ); - QString addCollectionCommandLine() const; - void setAddCollectionCommandLine( const QString& cmd ); + TQString addCollectionCommandLine() const; + void setAddCollectionCommandLine( const TQString& cmd ); - QString removeCollectionCommandLine() const; - void setRemoveCollectionCommandLine( const QString& cmd ); + TQString removeCollectionCommandLine() const; + void setRemoveCollectionCommandLine( const TQString& cmd ); - void setMrmldCommandLine( const QString& cmd ); - QString mrmldCommandline() const; + void setMrmldCommandLine( const TQString& cmd ); + TQString mrmldCommandline() const; // e.g. Wolfgang needs this :) bool serverStartedIndividually() const { return m_serverStartedIndividually; } - static QString mrmldDataDir(); + static TQString mrmldDataDir(); private: void init(); - QString settingsGroup( const QString& host ) const + TQString settingsGroup( const TQString& host ) const { - return QString::fromLatin1( "SettingsFor: " ).append( host ); + return TQString::fromLatin1( "SettingsFor: " ).append( host ); } bool m_serverStartedIndividually; - QString m_defaultHost; - QStringList m_hostList; + TQString m_defaultHost; + TQStringList m_hostList; KConfig *m_config; KConfig *m_ownConfig; diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp index 0c5b692b..3e7d6d95 100644 --- a/kmrml/kmrml/lib/mrml_shared.cpp +++ b/kmrml/kmrml/lib/mrml_shared.cpp @@ -20,65 +20,65 @@ #include "mrml_shared.h" // mrml stuff -const QString * MrmlShared::m_sessionId = 0L; -const QString * MrmlShared::m_transactionId = 0L; -const QString * MrmlShared::m_algorithm = 0L; -const QString * MrmlShared::m_algorithmId = 0L; -const QString * MrmlShared::m_algorithmName = 0L; -const QString * MrmlShared::m_algorithmList = 0L; -const QString * MrmlShared::m_algorithmType = 0L; -const QString * MrmlShared::m_collectionId = 0L; -const QString * MrmlShared::m_collectionList = 0L; -const QString * MrmlShared::m_collection = 0L; -const QString * MrmlShared::m_collectionName = 0L; -const QString * MrmlShared::m_queryParadigm = 0L; -const QString * MrmlShared::m_queryParadigmList = 0L; -const QString * MrmlShared::m_configureSession = 0L; - -const QString * MrmlShared::m_propertySheet = 0L; -const QString * MrmlShared::m_propertySheetId = 0L; -const QString * MrmlShared::m_propertySheetType = 0L; -const QString * MrmlShared::m_sendName = 0L; -const QString * MrmlShared::m_sendType = 0L; -const QString * MrmlShared::m_sendValue = 0L; -const QString * MrmlShared::m_maxSubsetSize = 0L; -const QString * MrmlShared::m_minSubsetSize = 0L; -const QString * MrmlShared::m_caption = 0L; -const QString * MrmlShared::m_from = 0L; -const QString * MrmlShared::m_to = 0L; -const QString * MrmlShared::m_step = 0L; -const QString * MrmlShared::m_sendBooleanInverted = 0L; - -const QString * MrmlShared::m_element = 0L; -const QString * MrmlShared::m_attribute = 0L; -const QString * MrmlShared::m_attributeName = 0L; -const QString * MrmlShared::m_attributeValue = 0L; -const QString * MrmlShared::m_children = 0L; -const QString * MrmlShared::m_none = 0L; - -const QString * MrmlShared::m_multiSet = 0L; -const QString * MrmlShared::m_subset = 0L; -const QString * MrmlShared::m_setElement = 0L; -const QString * MrmlShared::m_boolean = 0L; -const QString * MrmlShared::m_numeric = 0L; -const QString * MrmlShared::m_textual = 0L; -const QString * MrmlShared::m_panel = 0L; -const QString * MrmlShared::m_clone = 0L; -const QString * MrmlShared::m_reference = 0L; - -const QString * MrmlShared::m_visibility = 0L; -const QString * MrmlShared::m_visible = 0L; -const QString * MrmlShared::m_invisible = 0L; -const QString * MrmlShared::m_popup = 0L; -// const QString * MrmlShared::m_ = 0L; +const TQString * MrmlShared::m_sessionId = 0L; +const TQString * MrmlShared::m_transactionId = 0L; +const TQString * MrmlShared::m_algorithm = 0L; +const TQString * MrmlShared::m_algorithmId = 0L; +const TQString * MrmlShared::m_algorithmName = 0L; +const TQString * MrmlShared::m_algorithmList = 0L; +const TQString * MrmlShared::m_algorithmType = 0L; +const TQString * MrmlShared::m_collectionId = 0L; +const TQString * MrmlShared::m_collectionList = 0L; +const TQString * MrmlShared::m_collection = 0L; +const TQString * MrmlShared::m_collectionName = 0L; +const TQString * MrmlShared::m_queryParadigm = 0L; +const TQString * MrmlShared::m_queryParadigmList = 0L; +const TQString * MrmlShared::m_configureSession = 0L; + +const TQString * MrmlShared::m_propertySheet = 0L; +const TQString * MrmlShared::m_propertySheetId = 0L; +const TQString * MrmlShared::m_propertySheetType = 0L; +const TQString * MrmlShared::m_sendName = 0L; +const TQString * MrmlShared::m_sendType = 0L; +const TQString * MrmlShared::m_sendValue = 0L; +const TQString * MrmlShared::m_maxSubsetSize = 0L; +const TQString * MrmlShared::m_minSubsetSize = 0L; +const TQString * MrmlShared::m_caption = 0L; +const TQString * MrmlShared::m_from = 0L; +const TQString * MrmlShared::m_to = 0L; +const TQString * MrmlShared::m_step = 0L; +const TQString * MrmlShared::m_sendBooleanInverted = 0L; + +const TQString * MrmlShared::m_element = 0L; +const TQString * MrmlShared::m_attribute = 0L; +const TQString * MrmlShared::m_attributeName = 0L; +const TQString * MrmlShared::m_attributeValue = 0L; +const TQString * MrmlShared::m_children = 0L; +const TQString * MrmlShared::m_none = 0L; + +const TQString * MrmlShared::m_multiSet = 0L; +const TQString * MrmlShared::m_subset = 0L; +const TQString * MrmlShared::m_setElement = 0L; +const TQString * MrmlShared::m_boolean = 0L; +const TQString * MrmlShared::m_numeric = 0L; +const TQString * MrmlShared::m_textual = 0L; +const TQString * MrmlShared::m_panel = 0L; +const TQString * MrmlShared::m_clone = 0L; +const TQString * MrmlShared::m_reference = 0L; + +const TQString * MrmlShared::m_visibility = 0L; +const TQString * MrmlShared::m_visible = 0L; +const TQString * MrmlShared::m_invisible = 0L; +const TQString * MrmlShared::m_popup = 0L; +// const TQString * MrmlShared::m_ = 0L; // meta-data -const QString * MrmlShared::m_mrml_data = 0L; +const TQString * MrmlShared::m_mrml_data = 0L; // kio_mrml tasks -const QString * MrmlShared::m_kio_task = 0L; -const QString * MrmlShared::m_kio_initialize = 0L; -const QString * MrmlShared::m_kio_startQuery = 0L; +const TQString * MrmlShared::m_kio_task = 0L; +const TQString * MrmlShared::m_kio_initialize = 0L; +const TQString * MrmlShared::m_kio_startQuery = 0L; int MrmlShared::s_references = 0; @@ -108,65 +108,65 @@ bool MrmlShared::deref() void MrmlShared::init() { - m_sessionId = new QString ( "session-id" ) ; - m_transactionId = new QString ( "transaction-id" ) ; - m_algorithm = new QString ( "algorithm" ) ; - m_algorithmId = new QString ( "algorithm-id" ) ; - m_algorithmName = new QString ( "algorithm-name" ) ; - m_algorithmList = new QString ( "algorithm-list" ) ; - m_algorithmType = new QString ( "algorithm-type" ) ; - m_collectionId = new QString ( "collection-id" ) ; - m_collectionList = new QString ( "collection-list" ) ; - m_collection = new QString ( "collection" ) ; - m_collectionName = new QString ( "collection-name" ) ; - m_queryParadigm = new QString ( "query-paradigm" ) ; - m_queryParadigmList = new QString ( "query-paradigm-list" ) ; - m_configureSession = new QString ( "configure-session" ) ; - - m_propertySheet = new QString ( "property-sheet" ) ; - m_propertySheetId = new QString ( "property-sheet-id" ) ; - m_propertySheetType = new QString ( "property-sheet-type" ) ; - m_sendName = new QString ( "send-name" ) ; - m_sendType = new QString ( "send-type" ) ; - m_sendValue = new QString ( "send-value" ) ; - m_maxSubsetSize = new QString ( "maxsubsetsize" ) ; - m_minSubsetSize = new QString ( "minsubsetsize" ) ; - m_caption = new QString ( "caption" ) ; - m_from = new QString ( "from" ) ; - m_to = new QString ( "to" ) ; - m_step = new QString ( "step" ) ; - m_sendBooleanInverted = new QString ( "send-boolean-inverted" ) ; - - m_element = new QString ( "element" ) ; - m_attribute = new QString ( "attribute" ) ; - m_attributeName = new QString ( "attribute-name" ) ; - m_attributeValue = new QString ( "attribute-value" ) ; - m_children = new QString ( "children" ) ; - m_none = new QString ( "none" ) ; - - m_multiSet = new QString ( "multi-set" ) ; - m_subset = new QString ( "subset" ) ; - m_setElement = new QString ( "set-element" ) ; - m_boolean = new QString ( "boolean" ) ; - m_numeric = new QString ( "numeric" ) ; - m_textual = new QString ( "textual" ) ; - m_panel = new QString ( "panel" ) ; - m_clone = new QString ( "clone" ) ; - m_reference = new QString ( "reference" ) ; - - m_visibility = new QString ( "visibility" ) ; - m_visible = new QString ( "visible" ) ; - m_invisible = new QString ( "invisible" ) ; - m_popup = new QString ( "popup" ) ; -// m_ = new QString ( "" ) ; + m_sessionId = new TQString ( "session-id" ) ; + m_transactionId = new TQString ( "transaction-id" ) ; + m_algorithm = new TQString ( "algorithm" ) ; + m_algorithmId = new TQString ( "algorithm-id" ) ; + m_algorithmName = new TQString ( "algorithm-name" ) ; + m_algorithmList = new TQString ( "algorithm-list" ) ; + m_algorithmType = new TQString ( "algorithm-type" ) ; + m_collectionId = new TQString ( "collection-id" ) ; + m_collectionList = new TQString ( "collection-list" ) ; + m_collection = new TQString ( "collection" ) ; + m_collectionName = new TQString ( "collection-name" ) ; + m_queryParadigm = new TQString ( "query-paradigm" ) ; + m_queryParadigmList = new TQString ( "query-paradigm-list" ) ; + m_configureSession = new TQString ( "configure-session" ) ; + + m_propertySheet = new TQString ( "property-sheet" ) ; + m_propertySheetId = new TQString ( "property-sheet-id" ) ; + m_propertySheetType = new TQString ( "property-sheet-type" ) ; + m_sendName = new TQString ( "send-name" ) ; + m_sendType = new TQString ( "send-type" ) ; + m_sendValue = new TQString ( "send-value" ) ; + m_maxSubsetSize = new TQString ( "maxsubsetsize" ) ; + m_minSubsetSize = new TQString ( "minsubsetsize" ) ; + m_caption = new TQString ( "caption" ) ; + m_from = new TQString ( "from" ) ; + m_to = new TQString ( "to" ) ; + m_step = new TQString ( "step" ) ; + m_sendBooleanInverted = new TQString ( "send-boolean-inverted" ) ; + + m_element = new TQString ( "element" ) ; + m_attribute = new TQString ( "attribute" ) ; + m_attributeName = new TQString ( "attribute-name" ) ; + m_attributeValue = new TQString ( "attribute-value" ) ; + m_children = new TQString ( "children" ) ; + m_none = new TQString ( "none" ) ; + + m_multiSet = new TQString ( "multi-set" ) ; + m_subset = new TQString ( "subset" ) ; + m_setElement = new TQString ( "set-element" ) ; + m_boolean = new TQString ( "boolean" ) ; + m_numeric = new TQString ( "numeric" ) ; + m_textual = new TQString ( "textual" ) ; + m_panel = new TQString ( "panel" ) ; + m_clone = new TQString ( "clone" ) ; + m_reference = new TQString ( "reference" ) ; + + m_visibility = new TQString ( "visibility" ) ; + m_visible = new TQString ( "visible" ) ; + m_invisible = new TQString ( "invisible" ) ; + m_popup = new TQString ( "popup" ) ; +// m_ = new TQString ( "" ) ; // meta-data - m_mrml_data = new QString ( "mrml_data" ) ; + m_mrml_data = new TQString ( "mrml_data" ) ; // kio_mrml tasks - m_kio_task = new QString ( "kio_task" ) ; - m_kio_initialize = new QString ( "kio_initialize" ) ; - m_kio_startQuery = new QString ( "kio_startQuery" ) ; + m_kio_task = new TQString ( "kio_task" ) ; + m_kio_initialize = new TQString ( "kio_initialize" ) ; + m_kio_startQuery = new TQString ( "kio_startQuery" ) ; } void MrmlShared::cleanup() diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h index aff2a98d..6ed2177a 100644 --- a/kmrml/kmrml/lib/mrml_shared.h +++ b/kmrml/kmrml/lib/mrml_shared.h @@ -22,8 +22,8 @@ // maybe use mrml_const.h from libMRML, unfortunately not installed // by gift 0.1.6pre2 -#include <qshared.h> -#include <qstring.h> +#include <tqshared.h> +#include <tqstring.h> class MrmlShared { @@ -32,129 +32,129 @@ public: static void ref(); static bool deref(); - static const QString& sessionId() { return *m_sessionId; } - static const QString& transactionId() { return *m_transactionId; } - static const QString& algorithm() { return *m_algorithm; } - static const QString& algorithmId() { return *m_algorithmId; } - static const QString& algorithmName() { return *m_algorithmName; } - static const QString& algorithmList() { return *m_algorithmList; } - static const QString& algorithmType() { return *m_algorithmType; } - static const QString& collectionId() { return *m_collectionId; } - static const QString& collectionList() { return *m_collectionList; } - static const QString& collection() { return *m_collection; } - static const QString& collectionName() { return *m_collectionName; } - static const QString& queryParadigm() { return *m_queryParadigm; } - static const QString& queryParadigmList() { return *m_queryParadigmList; } - static const QString& configureSession() { return *m_configureSession; } + static const TQString& sessionId() { return *m_sessionId; } + static const TQString& transactionId() { return *m_transactionId; } + static const TQString& algorithm() { return *m_algorithm; } + static const TQString& algorithmId() { return *m_algorithmId; } + static const TQString& algorithmName() { return *m_algorithmName; } + static const TQString& algorithmList() { return *m_algorithmList; } + static const TQString& algorithmType() { return *m_algorithmType; } + static const TQString& collectionId() { return *m_collectionId; } + static const TQString& collectionList() { return *m_collectionList; } + static const TQString& collection() { return *m_collection; } + static const TQString& collectionName() { return *m_collectionName; } + static const TQString& queryParadigm() { return *m_queryParadigm; } + static const TQString& queryParadigmList() { return *m_queryParadigmList; } + static const TQString& configureSession() { return *m_configureSession; } // property sheet stuff - static const QString& propertySheet() { return *m_propertySheet; } - static const QString& propertySheetId() { return *m_propertySheetId; } - static const QString& propertySheetType() { return *m_propertySheetType; } - static const QString& sendName() { return *m_sendName; } - static const QString& sendType() { return *m_sendType; } - static const QString& sendValue() { return *m_sendValue; } - static const QString& maxSubsetSize() { return *m_maxSubsetSize; } - static const QString& minSubsetSize() { return *m_minSubsetSize; } - static const QString& caption() { return *m_caption; } - static const QString& from() { return *m_from; } - static const QString& to() { return *m_to; } - static const QString& step() { return *m_step; } - static const QString& sendBooleanInverted() { return *m_sendBooleanInverted; } - - static const QString& multiSet() { return *m_multiSet; } - static const QString& subset() { return *m_subset; } - static const QString& setElement() { return *m_setElement; } - static const QString& boolean() { return *m_boolean; } - static const QString& numeric() { return *m_numeric; } - static const QString& textual() { return *m_textual; } - static const QString& panel() { return *m_panel; } - static const QString& clone() { return *m_clone; } - static const QString& reference() { return *m_reference; } - - static const QString& element() { return *m_element; } - static const QString& attribute() { return *m_attribute; } - static const QString& attributeName() { return *m_attributeName; } - static const QString& attributeValue() { return *m_attributeValue; } - static const QString& children() { return *m_children; } - static const QString& none() { return *m_none; } - - static const QString& visibility() { return *m_visibility; } - static const QString& visible() { return *m_visible; } - static const QString& invisible() { return *m_invisible; } - static const QString& popup() { return *m_popup; } -// static const QString& () { return *m_; } + static const TQString& propertySheet() { return *m_propertySheet; } + static const TQString& propertySheetId() { return *m_propertySheetId; } + static const TQString& propertySheetType() { return *m_propertySheetType; } + static const TQString& sendName() { return *m_sendName; } + static const TQString& sendType() { return *m_sendType; } + static const TQString& sendValue() { return *m_sendValue; } + static const TQString& maxSubsetSize() { return *m_maxSubsetSize; } + static const TQString& minSubsetSize() { return *m_minSubsetSize; } + static const TQString& caption() { return *m_caption; } + static const TQString& from() { return *m_from; } + static const TQString& to() { return *m_to; } + static const TQString& step() { return *m_step; } + static const TQString& sendBooleanInverted() { return *m_sendBooleanInverted; } + + static const TQString& multiSet() { return *m_multiSet; } + static const TQString& subset() { return *m_subset; } + static const TQString& setElement() { return *m_setElement; } + static const TQString& boolean() { return *m_boolean; } + static const TQString& numeric() { return *m_numeric; } + static const TQString& textual() { return *m_textual; } + static const TQString& panel() { return *m_panel; } + static const TQString& clone() { return *m_clone; } + static const TQString& reference() { return *m_reference; } + + static const TQString& element() { return *m_element; } + static const TQString& attribute() { return *m_attribute; } + static const TQString& attributeName() { return *m_attributeName; } + static const TQString& attributeValue() { return *m_attributeValue; } + static const TQString& children() { return *m_children; } + static const TQString& none() { return *m_none; } + + static const TQString& visibility() { return *m_visibility; } + static const TQString& visible() { return *m_visible; } + static const TQString& invisible() { return *m_invisible; } + static const TQString& popup() { return *m_popup; } +// static const TQString& () { return *m_; } // meta-data - static const QString& mrml_data() { return *m_mrml_data; } + static const TQString& mrml_data() { return *m_mrml_data; } // kio_mrml tasks - static const QString& kio_task() { return *m_kio_task; } - static const QString& kio_initialize() { return *m_kio_initialize; } - static const QString& kio_startQuery() { return *m_kio_startQuery; } + static const TQString& kio_task() { return *m_kio_task; } + static const TQString& kio_initialize() { return *m_kio_initialize; } + static const TQString& kio_startQuery() { return *m_kio_startQuery; } private: - static const QString * m_sessionId; - static const QString * m_transactionId; - static const QString * m_algorithm; - static const QString * m_algorithmId; - static const QString * m_algorithmName; - static const QString * m_algorithmList; - static const QString * m_algorithmType; - static const QString * m_collectionId; - static const QString * m_collectionList; - static const QString * m_collection; - static const QString * m_collectionName; - static const QString * m_queryParadigm; - static const QString * m_queryParadigmList; - static const QString * m_configureSession; + static const TQString * m_sessionId; + static const TQString * m_transactionId; + static const TQString * m_algorithm; + static const TQString * m_algorithmId; + static const TQString * m_algorithmName; + static const TQString * m_algorithmList; + static const TQString * m_algorithmType; + static const TQString * m_collectionId; + static const TQString * m_collectionList; + static const TQString * m_collection; + static const TQString * m_collectionName; + static const TQString * m_queryParadigm; + static const TQString * m_queryParadigmList; + static const TQString * m_configureSession; // property sheet stuff - static const QString * m_propertySheet; - static const QString * m_propertySheetId; - static const QString * m_propertySheetType; - static const QString * m_sendName; - static const QString * m_sendType; - static const QString * m_sendValue; - static const QString * m_maxSubsetSize; - static const QString * m_minSubsetSize; - static const QString * m_caption; - static const QString * m_from; - static const QString * m_to; - static const QString * m_step; - static const QString * m_sendBooleanInverted; - - static const QString * m_multiSet; - static const QString * m_subset; - static const QString * m_setElement; - static const QString * m_boolean; - static const QString * m_numeric; - static const QString * m_textual; - static const QString * m_panel; - static const QString * m_clone; - static const QString * m_reference; - - static const QString * m_element; - static const QString * m_attribute; - static const QString * m_attributeName; - static const QString * m_attributeValue; - static const QString * m_children; - static const QString * m_none; - - static const QString * m_visibility; - static const QString * m_visible; - static const QString * m_invisible; - static const QString * m_popup; -// static const QString * m_; + static const TQString * m_propertySheet; + static const TQString * m_propertySheetId; + static const TQString * m_propertySheetType; + static const TQString * m_sendName; + static const TQString * m_sendType; + static const TQString * m_sendValue; + static const TQString * m_maxSubsetSize; + static const TQString * m_minSubsetSize; + static const TQString * m_caption; + static const TQString * m_from; + static const TQString * m_to; + static const TQString * m_step; + static const TQString * m_sendBooleanInverted; + + static const TQString * m_multiSet; + static const TQString * m_subset; + static const TQString * m_setElement; + static const TQString * m_boolean; + static const TQString * m_numeric; + static const TQString * m_textual; + static const TQString * m_panel; + static const TQString * m_clone; + static const TQString * m_reference; + + static const TQString * m_element; + static const TQString * m_attribute; + static const TQString * m_attributeName; + static const TQString * m_attributeValue; + static const TQString * m_children; + static const TQString * m_none; + + static const TQString * m_visibility; + static const TQString * m_visible; + static const TQString * m_invisible; + static const TQString * m_popup; +// static const TQString * m_; // meta-data - static const QString * m_mrml_data; + static const TQString * m_mrml_data; // kio_mrml tasks - static const QString * m_kio_task; - static const QString * m_kio_initialize; - static const QString * m_kio_startQuery; + static const TQString * m_kio_task; + static const TQString * m_kio_initialize; + static const TQString * m_kio_startQuery; private: static void cleanup(); diff --git a/kmrml/kmrml/lib/mrml_utils.h b/kmrml/kmrml/lib/mrml_utils.h index 25f39d98..ee2fdb30 100644 --- a/kmrml/kmrml/lib/mrml_utils.h +++ b/kmrml/kmrml/lib/mrml_utils.h @@ -20,7 +20,7 @@ #ifndef MRML_UTILS_H #define MRML_UTILS_H -#include <qobject.h> +#include <tqobject.h> #include <kurl.h> diff --git a/kmrml/kmrml/lib/watcher_stub.cpp b/kmrml/kmrml/lib/watcher_stub.cpp index cf84818b..ca9ca7b2 100644 --- a/kmrml/kmrml/lib/watcher_stub.cpp +++ b/kmrml/kmrml/lib/watcher_stub.cpp @@ -11,34 +11,34 @@ namespace KMrml { -Watcher_stub::Watcher_stub( const QCString& app, const QCString& obj ) +Watcher_stub::Watcher_stub( const TQCString& app, const TQCString& obj ) : DCOPStub( app, obj ) { } -Watcher_stub::Watcher_stub( DCOPClient* client, const QCString& app, const QCString& obj ) +Watcher_stub::Watcher_stub( DCOPClient* client, const TQCString& app, const TQCString& obj ) : DCOPStub( client, app, obj ) { } -bool Watcher_stub::requireDaemon( const QCString& arg0, const QString& arg1, const QString& arg2, uint arg3, int arg4 ) +bool Watcher_stub::requireDaemon( const TQCString& arg0, const TQString& arg1, const TQString& arg2, uint arg3, int arg4 ) { bool result; if ( !dcopClient() ) { setStatus( CallFailed ); return false; } - QByteArray data, replyData; - QCString replyType; - QDataStream arg( data, IO_WriteOnly ); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg( data, IO_WriteOnly ); arg << arg0; arg << arg1; arg << arg2; arg << arg3; arg << arg4; - if ( dcopClient()->call( app(), obj(), "requireDaemon(QCString,QString,QString,uint,int)", data, replyType, replyData ) ) { + if ( dcopClient()->call( app(), obj(), "requireDaemon(TQCString,TQString,TQString,uint,int)", data, replyType, replyData ) ) { if ( replyType == "bool" ) { - QDataStream _reply_stream( replyData, IO_ReadOnly ); + TQDataStream _reply_stream( replyData, IO_ReadOnly ); _reply_stream >> result; setStatus( CallSucceeded ); } else { @@ -50,36 +50,36 @@ bool Watcher_stub::requireDaemon( const QCString& arg0, const QString& arg1, con return result; } -void Watcher_stub::unrequireDaemon( const QCString& arg0, const QString& arg1 ) +void Watcher_stub::unrequireDaemon( const TQCString& arg0, const TQString& arg1 ) { if ( !dcopClient() ) { setStatus( CallFailed ); return; } - QByteArray data, replyData; - QCString replyType; - QDataStream arg( data, IO_WriteOnly ); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg( data, IO_WriteOnly ); arg << arg0; arg << arg1; - if ( dcopClient()->call( app(), obj(), "unrequireDaemon(QCString,QString)", data, replyType, replyData ) ) { + if ( dcopClient()->call( app(), obj(), "unrequireDaemon(TQCString,TQString)", data, replyType, replyData ) ) { setStatus( CallSucceeded ); } else { callFailed(); } } -QStringList Watcher_stub::runningDaemons() +TQStringList Watcher_stub::runningDaemons() { - QStringList result; + TQStringList result; if ( !dcopClient() ) { setStatus( CallFailed ); return result; } - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if ( dcopClient()->call( app(), obj(), "runningDaemons()", data, replyType, replyData ) ) { - if ( replyType == "QStringList" ) { - QDataStream _reply_stream( replyData, IO_ReadOnly ); + if ( replyType == "TQStringList" ) { + TQDataStream _reply_stream( replyData, IO_ReadOnly ); _reply_stream >> result; setStatus( CallSucceeded ); } else { diff --git a/kmrml/kmrml/lib/watcher_stub.h b/kmrml/kmrml/lib/watcher_stub.h index 04b1292e..ce570908 100644 --- a/kmrml/kmrml/lib/watcher_stub.h +++ b/kmrml/kmrml/lib/watcher_stub.h @@ -8,12 +8,12 @@ #define __WATCHER_STUB__ #include <dcopstub.h> -#include <qdict.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qstrlist.h> -#include <qstringlist.h> -#include <qtimer.h> +#include <tqdict.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqstrlist.h> +#include <tqstringlist.h> +#include <tqtimer.h> #include <kdedmodule.h> #include <kprocess.h> @@ -22,11 +22,11 @@ namespace KMrml { class Watcher_stub : public DCOPStub { public: - Watcher_stub( const QCString& app, const QCString& id ); - Watcher_stub( DCOPClient* client, const QCString& app, const QCString& id ); - virtual bool requireDaemon( const QCString& clientAppId, const QString& daemonKey, const QString& commandline, uint timeout, int numRestarts ); - virtual void unrequireDaemon( const QCString& clientAppId, const QString& daemonKey ); - virtual QStringList runningDaemons(); + Watcher_stub( const TQCString& app, const TQCString& id ); + Watcher_stub( DCOPClient* client, const TQCString& app, const TQCString& id ); + virtual bool requireDaemon( const TQCString& clientAppId, const TQString& daemonKey, const TQString& commandline, uint timeout, int numRestarts ); + virtual void unrequireDaemon( const TQCString& clientAppId, const TQString& daemonKey ); + virtual TQStringList runningDaemons(); protected: Watcher_stub() : DCOPStub( never_use ) {}; }; |