summaryrefslogtreecommitdiffstats
path: root/kmrml/kmrml/lib
diff options
context:
space:
mode:
Diffstat (limited to 'kmrml/kmrml/lib')
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp34
-rw-r--r--kmrml/kmrml/lib/kmrml_config.h2
-rw-r--r--kmrml/kmrml/lib/mrml_shared.cpp6
-rw-r--r--kmrml/kmrml/lib/mrml_shared.h4
-rw-r--r--kmrml/kmrml/lib/mrml_utils.h2
-rw-r--r--kmrml/kmrml/lib/watcher_stub.cpp2
6 files changed, 25 insertions, 25 deletions
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 6358971d..6d779860 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -30,9 +30,9 @@
#include <kdeversion.h>
#if KDE_VERSION < 307
- #define QUOTE( x ) x
+ #define TQUOTE( x ) x
#else
- #define QUOTE( x ) KProcess::quote( x )
+ #define TQUOTE( x ) KProcess::quote( x )
#endif
using namespace KMrml;
@@ -104,7 +104,7 @@ bool Config::sync()
void Config::setDefaultHost( const TQString& host )
{
m_defaultHost = host.isEmpty() ?
- TQString::fromLatin1(DEFAULT_HOST) : host;
+ TQString::tqfromLatin1(DEFAULT_HOST) : host;
m_config->setGroup( CONFIG_GROUP );
m_config->writeEntry( "Default Host", m_defaultHost );
@@ -137,7 +137,7 @@ ServerSettings Config::settingsForHost( const TQString& host ) const
void Config::addSettings( const ServerSettings& settings )
{
TQString host = settings.host;
- if ( m_hostList.find( host ) == m_hostList.end() )
+ if ( m_hostList.tqfind( host ) == m_hostList.end() )
m_hostList.append( host );
m_config->setGroup( CONFIG_GROUP );
@@ -181,13 +181,13 @@ TQString Config::addCollectionCommandLine() const
m_config->setGroup( CONFIG_GROUP );
TQString cmd = m_config->readEntry( "AddCollection Commandline",
DEFAULT_ADDCOLLECTION_CMD );
- int index = cmd.find( "%h" );
+ int index = cmd.tqfind( "%h" );
if ( index != -1 )
- cmd.replace( index, 2, QUOTE( mrmldDataDir() ) );
+ cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
- index = cmd.find( "%e" );
+ index = cmd.tqfind( "%e" );
if ( index != -1 )
- cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
+ cmd.tqreplace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
return cmd;
}
@@ -203,13 +203,13 @@ TQString Config::removeCollectionCommandLine() const
m_config->setGroup( CONFIG_GROUP );
TQString cmd = m_config->readEntry( "RemoveCollection Commandline",
DEFAULT_REMOVECOLLECTION_CMD );
- int index = cmd.find( "%h" );
+ int index = cmd.tqfind( "%h" );
if ( index != -1 )
- cmd.replace( index, 2, QUOTE( mrmldDataDir() ) );
+ cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
- index = cmd.find( "%e" );
+ index = cmd.tqfind( "%e" );
if ( index != -1 )
- cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
+ cmd.tqreplace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
return cmd;
}
@@ -231,17 +231,17 @@ TQString Config::mrmldCommandline() const
DEFAULT_MRMLD_CMD );
// add data directory and port to the commandline
- int index = cmd.find( "%p" );
+ int index = cmd.tqfind( "%p" );
if ( index != -1 )
{
TQString port = settings.autoPort ?
- TQString::null : TQString::number( settings.configuredPort );
- cmd.replace( index, 2, port );
+ TQString() : TQString::number( settings.configuredPort );
+ cmd.tqreplace( index, 2, port );
}
- index = cmd.find( "%d" );
+ index = cmd.tqfind( "%d" );
if ( index != -1 )
{
- cmd.replace( index, 2, QUOTE( mrmldDataDir() ) );
+ cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
}
qDebug("***** commandline: %s", cmd.latin1());
diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h
index 2208030a..4e39d3bf 100644
--- a/kmrml/kmrml/lib/kmrml_config.h
+++ b/kmrml/kmrml/lib/kmrml_config.h
@@ -108,7 +108,7 @@ namespace KMrml
TQString settingsGroup( const TQString& host ) const
{
- return TQString::fromLatin1( "SettingsFor: " ).append( host );
+ return TQString::tqfromLatin1( "SettingsFor: " ).append( host );
}
bool m_serverStartedIndividually;
diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp
index 3e7d6d95..932010f6 100644
--- a/kmrml/kmrml/lib/mrml_shared.cpp
+++ b/kmrml/kmrml/lib/mrml_shared.cpp
@@ -53,7 +53,7 @@ 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_tqchildren = 0L;
const TQString * MrmlShared::m_none = 0L;
const TQString * MrmlShared::m_multiSet = 0L;
@@ -141,7 +141,7 @@ void MrmlShared::init()
m_attribute = new TQString ( "attribute" ) ;
m_attributeName = new TQString ( "attribute-name" ) ;
m_attributeValue = new TQString ( "attribute-value" ) ;
- m_children = new TQString ( "children" ) ;
+ m_tqchildren = new TQString ( "tqchildren" ) ;
m_none = new TQString ( "none" ) ;
m_multiSet = new TQString ( "multi-set" ) ;
@@ -215,7 +215,7 @@ void MrmlShared::cleanup()
delete m_attribute;
delete m_attributeName;
delete m_attributeValue;
- delete m_children;
+ delete m_tqchildren;
delete m_none;
delete m_visibility;
diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h
index 6ed2177a..175d5c3c 100644
--- a/kmrml/kmrml/lib/mrml_shared.h
+++ b/kmrml/kmrml/lib/mrml_shared.h
@@ -76,7 +76,7 @@ public:
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& tqchildren() { return *m_tqchildren; }
static const TQString& none() { return *m_none; }
static const TQString& visibility() { return *m_visibility; }
@@ -139,7 +139,7 @@ private:
static const TQString * m_attribute;
static const TQString * m_attributeName;
static const TQString * m_attributeValue;
- static const TQString * m_children;
+ static const TQString * m_tqchildren;
static const TQString * m_none;
static const TQString * m_visibility;
diff --git a/kmrml/kmrml/lib/mrml_utils.h b/kmrml/kmrml/lib/mrml_utils.h
index ee2fdb30..5707b177 100644
--- a/kmrml/kmrml/lib/mrml_utils.h
+++ b/kmrml/kmrml/lib/mrml_utils.h
@@ -28,7 +28,7 @@
namespace KMrml
{
- class Util : public QObject
+ class Util : public TQObject
{
public:
static Util * self();
diff --git a/kmrml/kmrml/lib/watcher_stub.cpp b/kmrml/kmrml/lib/watcher_stub.cpp
index ca9ca7b2..d10dcbc7 100644
--- a/kmrml/kmrml/lib/watcher_stub.cpp
+++ b/kmrml/kmrml/lib/watcher_stub.cpp
@@ -78,7 +78,7 @@ TQStringList Watcher_stub::runningDaemons()
TQByteArray data, replyData;
TQCString replyType;
if ( dcopClient()->call( app(), obj(), "runningDaemons()", data, replyType, replyData ) ) {
- if ( replyType == "TQStringList" ) {
+ if ( replyType == TQSTRINGLIST_OBJECT_NAME_STRING ) {
TQDataStream _reply_stream( replyData, IO_ReadOnly );
_reply_stream >> result;
setStatus( CallSucceeded );
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 20:20:38 +0000