diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:37:49 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:37:49 -0600 |
commit | f8069e2ea048f2657cc417d83820576ec55c181b (patch) | |
tree | cbc5bf540866934a91e0f33b260fc7a25e191fad /kbugbuster/backend | |
parent | e6aaa3624cc6179b82a9bfff1760e742a669064c (diff) | |
download | tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kbugbuster/backend')
-rw-r--r-- | kbugbuster/backend/bugcommand.cpp | 22 | ||||
-rw-r--r-- | kbugbuster/backend/bugcommand.h | 26 | ||||
-rw-r--r-- | kbugbuster/backend/bugjob.cpp | 28 | ||||
-rw-r--r-- | kbugbuster/backend/bugjob.h | 10 | ||||
-rw-r--r-- | kbugbuster/backend/bugserver.cpp | 4 | ||||
-rw-r--r-- | kbugbuster/backend/bugserver.h | 4 | ||||
-rw-r--r-- | kbugbuster/backend/bugserverconfig.cpp | 4 | ||||
-rw-r--r-- | kbugbuster/backend/bugserverconfig.h | 6 | ||||
-rw-r--r-- | kbugbuster/backend/bugsystem.cpp | 4 | ||||
-rw-r--r-- | kbugbuster/backend/bugsystem.h | 6 | ||||
-rw-r--r-- | kbugbuster/backend/kbbprefs.cpp | 2 | ||||
-rw-r--r-- | kbugbuster/backend/kbbprefs.h | 2 |
12 files changed, 59 insertions, 59 deletions
diff --git a/kbugbuster/backend/bugcommand.cpp b/kbugbuster/backend/bugcommand.cpp index 25e08184..f8b55ac9 100644 --- a/kbugbuster/backend/bugcommand.cpp +++ b/kbugbuster/backend/bugcommand.cpp @@ -14,7 +14,7 @@ TQString BugCommand::details() return TQString(); } -BugCommand *BugCommand::load( KConfig *config, const TQString &type ) +BugCommand *BugCommand::load( TDEConfig *config, const TQString &type ) { TQString bugNumber = config->group(); // ### this sucks. we better let Bug implement proper persistance, @@ -90,7 +90,7 @@ TQString BugCommandClose::details() const return m_message; } -void BugCommandClose::save( KConfig *config ) +void BugCommandClose::save( TDEConfig *config ) { config->writeEntry( "Close",m_message ); } @@ -107,7 +107,7 @@ TQString BugCommandCloseSilently::name() return i18n("Close Silently"); } -void BugCommandCloseSilently::save( KConfig *config ) +void BugCommandCloseSilently::save( TDEConfig *config ) { config->writeEntry( "CloseSilently", true ); } @@ -124,7 +124,7 @@ TQString BugCommandReopen::name() return i18n("Reopen"); } -void BugCommandReopen::save( KConfig *config ) +void BugCommandReopen::save( TDEConfig *config ) { config->writeEntry( "Reopen", true ); } @@ -146,7 +146,7 @@ TQString BugCommandRetitle::details() const return m_title; } -void BugCommandRetitle::save( KConfig *config ) +void BugCommandRetitle::save( TDEConfig *config ) { config->writeEntry( "Retitle", m_title ); } @@ -168,7 +168,7 @@ TQString BugCommandMerge::details() const return m_bugNumbers.join(", "); } -void BugCommandMerge::save( KConfig *config ) +void BugCommandMerge::save( TDEConfig *config ) { config->writeEntry( "Merge", m_bugNumbers ); } @@ -185,7 +185,7 @@ TQString BugCommandUnmerge::name() return i18n("Unmerge"); } -void BugCommandUnmerge::save( KConfig *config ) +void BugCommandUnmerge::save( TDEConfig *config ) { config->writeEntry( "Unmerge", true ); } @@ -234,7 +234,7 @@ TQString BugCommandReply::details() const return m_message; } -void BugCommandReply::save( KConfig *config ) +void BugCommandReply::save( TDEConfig *config ) { config->writeEntry( "Reply", m_message ); #if 0 @@ -264,7 +264,7 @@ TQString BugCommandReplyPrivate::details() const return m_message; } -void BugCommandReplyPrivate::save( KConfig *config ) +void BugCommandReplyPrivate::save( TDEConfig *config ) { TQStringList args; args << m_address; @@ -289,7 +289,7 @@ TQString BugCommandSeverity::details() const return m_severity; } -void BugCommandSeverity::save( KConfig *config ) +void BugCommandSeverity::save( TDEConfig *config ) { config->writeEntry( "Severity", m_severity ); } @@ -311,7 +311,7 @@ TQString BugCommandReassign::details() const return m_package; } -void BugCommandReassign::save( KConfig *config ) +void BugCommandReassign::save( TDEConfig *config ) { config->writeEntry( "Reassign", m_package ); } diff --git a/kbugbuster/backend/bugcommand.h b/kbugbuster/backend/bugcommand.h index 9f68fb2e..e293517c 100644 --- a/kbugbuster/backend/bugcommand.h +++ b/kbugbuster/backend/bugcommand.h @@ -7,7 +7,7 @@ #include "bug.h" #include "package.h" -class KConfig; +class TDEConfig; class BugCommand { public: @@ -31,8 +31,8 @@ class BugCommand { virtual TQString type() const { return TQString(); } - virtual void save( KConfig * ) = 0; - static BugCommand *load( KConfig *, const TQString &type ); + virtual void save( TDEConfig * ) = 0; + static BugCommand *load( TDEConfig *, const TQString &type ); protected: Bug m_bug; @@ -53,7 +53,7 @@ class BugCommandClose : public BugCommand { TQString type() const { return TQString::fromLatin1("Close"); } - void save( KConfig * ); + void save( TDEConfig * ); private: TQString m_message; @@ -70,7 +70,7 @@ class BugCommandCloseSilently : public BugCommand { TQString type() const { return TQString::fromLatin1("CloseSilently"); } - void save( KConfig * ); + void save( TDEConfig * ); }; class BugCommandReopen : public BugCommand { @@ -84,7 +84,7 @@ class BugCommandReopen : public BugCommand { TQString type() const { return TQString::fromLatin1("Reopen"); } - void save( KConfig * ); + void save( TDEConfig * ); }; class BugCommandRetitle : public BugCommand { @@ -99,7 +99,7 @@ class BugCommandRetitle : public BugCommand { TQString type() const { return TQString::fromLatin1("Retitle"); } - void save( KConfig * ); + void save( TDEConfig * ); private: TQString m_title; @@ -117,7 +117,7 @@ class BugCommandMerge : public BugCommand { TQString type() const { return TQString::fromLatin1("Merge"); } - void save( KConfig * ); + void save( TDEConfig * ); private: TQStringList m_bugNumbers; @@ -132,7 +132,7 @@ class BugCommandUnmerge : public BugCommand { TQString type() const { return TQString::fromLatin1("Unmerge"); } - void save( KConfig * ); + void save( TDEConfig * ); TQString controlString() const; }; @@ -150,7 +150,7 @@ class BugCommandReply : public BugCommand { TQString type() const { return TQString::fromLatin1("Reply"); } - void save( KConfig * ); + void save( TDEConfig * ); private: TQString m_message; @@ -171,7 +171,7 @@ class BugCommandReplyPrivate : public BugCommand { TQString type() const { return TQString::fromLatin1("ReplyPrivate"); } - void save( KConfig * ); + void save( TDEConfig * ); private: TQString m_address; @@ -190,7 +190,7 @@ class BugCommandSeverity : public BugCommand { TQString controlString() const; - void save( KConfig * ); + void save( TDEConfig * ); private: TQString m_severity; @@ -208,7 +208,7 @@ class BugCommandReassign : public BugCommand { TQString controlString() const; - void save( KConfig * ); + void save( TDEConfig * ); private: TQString m_package; diff --git a/kbugbuster/backend/bugjob.cpp b/kbugbuster/backend/bugjob.cpp index 1d13913b..90828ceb 100644 --- a/kbugbuster/backend/bugjob.cpp +++ b/kbugbuster/backend/bugjob.cpp @@ -28,19 +28,19 @@ void BugJob::start( const KURL &url ) // ### obey post, if necessary - KIO::Job *job = KIO::get( url, true /*always 'reload=true', we have our own cache*/, false ); - - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( ioResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( ioData( KIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ), - this, TQT_SLOT( ioInfoMessage( KIO::Job *, const TQString & ) ) ); - connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), - this, TQT_SLOT( ioInfoPercent( KIO::Job *, unsigned long ) ) ); + TDEIO::Job *job = TDEIO::get( url, true /*always 'reload=true', we have our own cache*/, false ); + + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( ioResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQT_SLOT( ioData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), + this, TQT_SLOT( ioInfoMessage( TDEIO::Job *, const TQString & ) ) ); + connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + this, TQT_SLOT( ioInfoPercent( TDEIO::Job *, unsigned long ) ) ); } -void BugJob::ioResult( KIO::Job *job ) +void BugJob::ioResult( TDEIO::Job *job ) { m_error = job->error(); m_errorText = job->errorText(); @@ -71,7 +71,7 @@ void BugJob::ioResult( KIO::Job *job ) delete this; } -void BugJob::ioData( KIO::Job *, const TQByteArray &data ) +void BugJob::ioData( TDEIO::Job *, const TQByteArray &data ) { unsigned int start = m_data.size(); @@ -79,13 +79,13 @@ void BugJob::ioData( KIO::Job *, const TQByteArray &data ) memcpy( m_data.data() + start, data.data(), data.size() ); } -void BugJob::ioInfoMessage( KIO::Job *, const TQString &_text ) +void BugJob::ioInfoMessage( TDEIO::Job *, const TQString &_text ) { TQString text = _text; emit infoMessage( text ); } -void BugJob::ioInfoPercent( KIO::Job *, unsigned long percent ) +void BugJob::ioInfoPercent( TDEIO::Job *, unsigned long percent ) { emit infoPercent( percent ); } diff --git a/kbugbuster/backend/bugjob.h b/kbugbuster/backend/bugjob.h index 68e57841..981283db 100644 --- a/kbugbuster/backend/bugjob.h +++ b/kbugbuster/backend/bugjob.h @@ -5,7 +5,7 @@ #include "bugserver.h" -class BugJob : public KIO::Job +class BugJob : public TDEIO::Job { Q_OBJECT @@ -27,13 +27,13 @@ class BugJob : public KIO::Job virtual void process( const TQByteArray &data ) = 0; private slots: - void ioResult( KIO::Job *job ); + void ioResult( TDEIO::Job *job ); - void ioData( KIO::Job *job, const TQByteArray &data ); + void ioData( TDEIO::Job *job, const TQByteArray &data ); - void ioInfoMessage( KIO::Job *job, const TQString &text ); + void ioInfoMessage( TDEIO::Job *job, const TQString &text ); - void ioInfoPercent( KIO::Job *job, unsigned long percent ); + void ioInfoPercent( TDEIO::Job *job, unsigned long percent ); private: TQByteArray m_data; diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index 1ad90567..7711212f 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -195,11 +195,11 @@ Bug::Severity BugServer::bugSeverity( const TQString &str ) } } -void BugServer::readConfig( KConfig * /*config*/ ) +void BugServer::readConfig( TDEConfig * /*config*/ ) { } -void BugServer::writeConfig( KConfig * /*config*/ ) +void BugServer::writeConfig( TDEConfig * /*config*/ ) { } diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h index c76b565a..6d6ffdc0 100644 --- a/kbugbuster/backend/bugserver.h +++ b/kbugbuster/backend/bugserver.h @@ -70,9 +70,9 @@ class BugServer Processor *processor() const; - void readConfig( KConfig * ); + void readConfig( TDEConfig * ); - void writeConfig( KConfig * ); + void writeConfig( TDEConfig * ); /** Queue a new command. diff --git a/kbugbuster/backend/bugserverconfig.cpp b/kbugbuster/backend/bugserverconfig.cpp index a09e6c29..203c60a9 100644 --- a/kbugbuster/backend/bugserverconfig.cpp +++ b/kbugbuster/backend/bugserverconfig.cpp @@ -111,7 +111,7 @@ TQStringList BugServerConfig::bugzillaVersions() return v; } -void BugServerConfig::readConfig( KConfig *cfg, const TQString &name ) +void BugServerConfig::readConfig( TDEConfig *cfg, const TQString &name ) { mName = name; @@ -129,7 +129,7 @@ void BugServerConfig::readConfig( KConfig *cfg, const TQString &name ) mCurrentBug = cfg->readEntry( "CurrentBug" ); } -void BugServerConfig::writeConfig( KConfig *cfg ) +void BugServerConfig::writeConfig( TDEConfig *cfg ) { cfg->setGroup( "BugServer " + mName ); diff --git a/kbugbuster/backend/bugserverconfig.h b/kbugbuster/backend/bugserverconfig.h index 39a34463..5a252573 100644 --- a/kbugbuster/backend/bugserverconfig.h +++ b/kbugbuster/backend/bugserverconfig.h @@ -29,7 +29,7 @@ #include <kurl.h> -class KConfig; +class TDEConfig; class BugServerConfig { @@ -50,8 +50,8 @@ class BugServerConfig void setPassword( const TQString &password ); TQString password() const; - void readConfig( KConfig *, const TQString &name ); - void writeConfig( KConfig * ); + void readConfig( TDEConfig *, const TQString &name ); + void writeConfig( TDEConfig * ); static TQStringList bugzillaVersions(); diff --git a/kbugbuster/backend/bugsystem.cpp b/kbugbuster/backend/bugsystem.cpp index c3dc0cdd..808a45f6 100644 --- a/kbugbuster/backend/bugsystem.cpp +++ b/kbugbuster/backend/bugsystem.cpp @@ -373,7 +373,7 @@ TQString BugSystem::lastResponse() return mLastResponse; } -void BugSystem::readConfig( KConfig *config ) +void BugSystem::readConfig( TDEConfig *config ) { config->setGroup("Servers"); TQStringList servers = config->readListEntry( "Servers" ); @@ -394,7 +394,7 @@ void BugSystem::readConfig( KConfig *config ) setServerList( serverList ); } -void BugSystem::writeConfig( KConfig *config ) +void BugSystem::writeConfig( TDEConfig *config ) { TQValueList<BugServer *>::ConstIterator itServer; TQStringList servers; diff --git a/kbugbuster/backend/bugsystem.h b/kbugbuster/backend/bugsystem.h index 9a638675..7becf6b4 100644 --- a/kbugbuster/backend/bugsystem.h +++ b/kbugbuster/backend/bugsystem.h @@ -13,7 +13,7 @@ #include <tqmap.h> #include <tqpair.h> -class KConfig; +class TDEConfig; class BugCommand; class BugServer; @@ -80,8 +80,8 @@ class BugSystem : public TQObject static void saveResponse( const TQByteArray &d ); static TQString lastResponse(); - void readConfig( KConfig * ); - void writeConfig( KConfig * ); + void readConfig( TDEConfig * ); + void writeConfig( TDEConfig * ); signals: void packageListAvailable( const Package::List &pkgs ); diff --git a/kbugbuster/backend/kbbprefs.cpp b/kbugbuster/backend/kbbprefs.cpp index f6f3a69c..0fa2d5af 100644 --- a/kbugbuster/backend/kbbprefs.cpp +++ b/kbugbuster/backend/kbbprefs.cpp @@ -37,7 +37,7 @@ KBBPrefs *KBBPrefs::mInstance = 0; -KBBPrefs::KBBPrefs() : KConfigSkeleton() +KBBPrefs::KBBPrefs() : TDEConfigSkeleton() { setCurrentGroup("History"); diff --git a/kbugbuster/backend/kbbprefs.h b/kbugbuster/backend/kbbprefs.h index 87dfacd8..e3e2718d 100644 --- a/kbugbuster/backend/kbbprefs.h +++ b/kbugbuster/backend/kbbprefs.h @@ -32,7 +32,7 @@ class TQStringList; -class KBBPrefs : public KConfigSkeleton +class KBBPrefs : public TDEConfigSkeleton { public: virtual ~KBBPrefs(); |