summaryrefslogtreecommitdiffstats
path: root/libkcddb
diff options
context:
space:
mode:
Diffstat (limited to 'libkcddb')
-rw-r--r--libkcddb/cddb.cpp14
-rw-r--r--libkcddb/cddb.h4
-rw-r--r--libkcddb/cddbplookup.cpp16
-rw-r--r--libkcddb/cdinfo.cpp10
-rw-r--r--libkcddb/cdinfodialogbase.ui6
-rw-r--r--libkcddb/cdinfodialogbase.ui.h2
-rw-r--r--libkcddb/cdinfoencodingwidget.cpp4
-rw-r--r--libkcddb/cdinfoencodingwidgetbase.ui2
-rw-r--r--libkcddb/httplookup.cpp6
-rw-r--r--libkcddb/kcmcddb/cddbconfigwidgetbase.ui16
-rw-r--r--libkcddb/kcmcddb/kcmcddb.cpp8
-rw-r--r--libkcddb/lookup.cpp12
-rw-r--r--libkcddb/sites.cpp2
-rw-r--r--libkcddb/smtpsubmit.cpp2
-rw-r--r--libkcddb/submit.cpp8
15 files changed, 56 insertions, 56 deletions
diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index c11e086c..7cdfee6e 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -100,14 +100,14 @@ namespace KCDDB
bool
CDDB::parseGreeting( const TQString & line )
{
- uint servertqStatus = statusCode( line );
+ uint serverStatus = statusCode( line );
- if ( 200 == servertqStatus )
+ if ( 200 == serverStatus )
{
kdDebug(60010) << "Server response: read-only" << endl;
readOnly_ = true;
}
- else if ( 201 == servertqStatus )
+ else if ( 201 == serverStatus )
{
kdDebug(60010) << "Server response: read-write" << endl;
}
@@ -123,9 +123,9 @@ namespace KCDDB
bool
CDDB::parseHandshake( const TQString & line )
{
- uint servertqStatus = statusCode( line );
+ uint serverStatus = statusCode( line );
- if ( ( 200 != servertqStatus ) && ( 402 != servertqStatus ) )
+ if ( ( 200 != serverStatus ) && ( 402 != serverStatus ) )
{
kdDebug(60010) << "Handshake was too tight. Letting go." << endl;
return false;
@@ -141,9 +141,9 @@ namespace KCDDB
{
TQStringList tokenList = TQStringList::split( ' ', line );
- uint servertqStatus = tokenList[ 0 ].toUInt();
+ uint serverStatus = tokenList[ 0 ].toUInt();
- return servertqStatus;
+ return serverStatus;
}
/* CDDB::Transport
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index a848ffb8..38daf164 100644
--- a/libkcddb/cddb.h
+++ b/libkcddb/cddb.h
@@ -66,8 +66,8 @@ namespace KCDDB
static TQString resultToString(Result);
static TQString trackOffsetListToId( const TrackOffsetList & );
- static TQString clientName() { return TQString::tqfromLatin1("libkcddb"); }
- static TQString clientVersion() { return TQString::tqfromLatin1("0.31"); }
+ static TQString clientName() { return TQString::fromLatin1("libkcddb"); }
+ static TQString clientVersion() { return TQString::fromLatin1("0.31"); }
protected:
bool parseGreeting( const TQString & );
diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp
index db62cbae..839d2650 100644
--- a/libkcddb/cddbplookup.cpp
+++ b/libkcddb/cddbplookup.cpp
@@ -40,10 +40,10 @@ namespace KCDDB
CDDBPLookup::sendHandshake()
{
TQString handshake = TQString( "cddb hello %1 %2 %3 %4" )
- .tqarg( user_ )
- .tqarg( localHostName_ )
- .tqarg( clientName() )
- .tqarg( clientVersion() );
+ .arg( user_ )
+ .arg( localHostName_ )
+ .arg( clientName() )
+ .arg( clientVersion() );
writeLine( handshake );
}
@@ -58,8 +58,8 @@ namespace KCDDB
CDDBPLookup::sendQuery()
{
TQString query = TQString( "cddb query %1 %2" )
- .tqarg( trackOffsetListToId() )
- .tqarg( trackOffsetListToString() );
+ .arg( trackOffsetListToId() )
+ .arg( trackOffsetListToString() );
writeLine( query );
}
@@ -71,8 +71,8 @@ namespace KCDDB
TQString discid = match.second;
TQString readRequest = TQString( "cddb read %1 %2" )
- .tqarg( category_ )
- .tqarg( discid );
+ .arg( category_ )
+ .arg( discid );
writeLine( readRequest );
}
diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp
index b140f103..43346b46 100644
--- a/libkcddb/cdinfo.cpp
+++ b/libkcddb/cdinfo.cpp
@@ -209,7 +209,7 @@ namespace KCDDB
if (submit)
{
s += "#\n";
- s += TQString("# Submitted via: %1 %2\n").tqarg(CDDB::clientName(),
+ s += TQString("# Submitted via: %1 %2\n").arg(CDDB::clientName(),
CDDB::clientVersion());
}
@@ -220,7 +220,7 @@ namespace KCDDB
for (uint i = 0; i < trackInfoList.count(); ++i)
{
- s += createLine(TQString("TTITLE%1").tqarg(i),
+ s += createLine(TQString("TTITLE%1").arg(i),
escape( trackInfoList[ i ].title));
}
@@ -228,7 +228,7 @@ namespace KCDDB
for (uint i = 0; i < trackInfoList.count(); ++i)
{
- s += createLine(TQString("EXTT%1").tqarg(i), escape(trackInfoList[i].extt));
+ s += createLine(TQString("EXTT%1").arg(i), escape(trackInfoList[i].extt));
}
s +="PLAYORDER=\n";
@@ -251,11 +251,11 @@ namespace KCDDB
while (tmpValue.length() > maxLength)
{
- lines += TQString("%1=%2\n").tqarg(name,tmpValue.left(maxLength));
+ lines += TQString("%1=%2\n").arg(name,tmpValue.left(maxLength));
tmpValue = tmpValue.mid(maxLength);
}
- lines += TQString("%1=%2\n").tqarg(name,tmpValue);
+ lines += TQString("%1=%2\n").arg(name,tmpValue);
return lines;
}
diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui
index 17a97eb0..edc6e6fd 100644
--- a/libkcddb/cdinfodialogbase.ui
+++ b/libkcddb/cdinfodialogbase.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<grid>
<property name="name">
@@ -276,7 +276,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -292,7 +292,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>231</width>
<height>41</height>
diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h
index 24eaa6df..1c98e1df 100644
--- a/libkcddb/cdinfodialogbase.ui.h
+++ b/libkcddb/cdinfodialogbase.ui.h
@@ -7,7 +7,7 @@
** place of a destructor.
*****************************************************************************/
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <kglobal.h>
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index f18bb95b..18f75455 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -20,7 +20,7 @@
#include <tqcombobox.h>
#include <tqlistbox.h>
#include <tqlabel.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <klocale.h>
#include <kglobal.h>
#include <kcharsets.h>
@@ -62,7 +62,7 @@ namespace KCDDB
songsBox->clear();
songsBox->insertStringList(newTitles);
- titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").tqarg(
+ titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").arg(
codec->toUnicode(m_artist.latin1()), codec->toUnicode(m_title.latin1())));
}
}
diff --git a/libkcddb/cdinfoencodingwidgetbase.ui b/libkcddb/cdinfoencodingwidgetbase.ui
index e60d91b3..5605785c 100644
--- a/libkcddb/cdinfoencodingwidgetbase.ui
+++ b/libkcddb/cdinfoencodingwidgetbase.ui
@@ -55,7 +55,7 @@
<property name="name">
<cstring>songsBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>250</height>
diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp
index c3a942d3..461a9334 100644
--- a/libkcddb/httplookup.cpp
+++ b/libkcddb/httplookup.cpp
@@ -40,7 +40,7 @@ namespace KCDDB
HTTPLookup::sendQuery()
{
TQString cmd = TQString( "cddb query %1 %2" )
- .tqarg( trackOffsetListToId(), trackOffsetListToString() ) ;
+ .arg( trackOffsetListToId(), trackOffsetListToString() ) ;
makeURL( cmd );
Result result = fetchURL();
@@ -55,7 +55,7 @@ namespace KCDDB
TQString discid = match.second;
TQString cmd = TQString( "cddb read %1 %2" )
- .tqarg( category_, discid );
+ .arg( category_, discid );
makeURL( cmd );
Result result = fetchURL();
@@ -83,7 +83,7 @@ namespace KCDDB
cgiURL_.setQuery( TQString() );
TQString hello = TQString("%1 %2 %3 %4")
- .tqarg(user_, localHostName_, clientName(), clientVersion());
+ .arg(user_, localHostName_, clientName(), clientVersion());
cgiURL_.addQueryItem( "cmd", cmd );
cgiURL_.addQueryItem( "hello", hello );
diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
index ecd8a587..ad5fffb5 100644
--- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
+++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
@@ -192,7 +192,7 @@
<property name="text">
<string>&amp;Port:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -243,7 +243,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>260</height>
@@ -286,7 +286,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>240</height>
@@ -314,7 +314,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>21</height>
@@ -331,7 +331,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>21</height>
@@ -367,7 +367,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>140</height>
@@ -397,7 +397,7 @@
<property name="text">
<string>Port:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -517,7 +517,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>20</height>
diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index fa15a995..30c9749e 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqspinbox.h>
@@ -58,10 +58,10 @@ CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
addConfig(cfg, widget_);
- TQVBoxLayout * tqlayout = new TQVBoxLayout(this, 0);
+ TQVBoxLayout * layout = new TQVBoxLayout(this, 0);
- tqlayout->addWidget(widget_);
- tqlayout->addStretch();
+ layout->addWidget(widget_);
+ layout->addStretch();
setQuickHelp(i18n("CDDB is used to get information like artist, title and song-names in CD's"));
diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp
index 25c7599e..e353ece9 100644
--- a/libkcddb/lookup.cpp
+++ b/libkcddb/lookup.cpp
@@ -38,19 +38,19 @@ namespace KCDDB
CDDB::Result
Lookup::parseQuery( const TQString & line )
{
- uint servertqStatus = statusCode( line );
+ uint serverStatus = statusCode( line );
- if ( 200 == servertqStatus )
+ if ( 200 == serverStatus )
{
TQStringList tokenList = TQStringList::split( ' ', line );
matchList_.append( tqMakePair( tokenList[ 1 ], tokenList[ 2 ] ) );
return Success;
}
- else if ( ( 211 == servertqStatus ) || ( 210 == servertqStatus ) )
+ else if ( ( 211 == serverStatus ) || ( 210 == serverStatus ) )
{
return MultipleRecordFound;
}
- else if ( 202 == servertqStatus )
+ else if ( 202 == serverStatus )
{
return NoRecordFound;
}
@@ -68,9 +68,9 @@ namespace KCDDB
CDDB::Result
Lookup::parseRead( const TQString & line )
{
- uint servertqStatus = statusCode( line );
+ uint serverStatus = statusCode( line );
- if ( 210 != servertqStatus )
+ if ( 210 != serverStatus )
return ServerError;
return Success;
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index 18082587..16a7ac79 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -44,7 +44,7 @@ namespace KCDDB
url.setQuery( TQString() );
TQString hello = TQString("%1 %2 %3 %4")
- .tqarg(user_, localHostName_, clientName(), clientVersion());
+ .arg(user_, localHostName_, clientName(), clientVersion());
url.addQueryItem( "cmd", "sites" );
url.addQueryItem( "hello", hello );
diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp
index 9733ee40..07f34b61 100644
--- a/libkcddb/smtpsubmit.cpp
+++ b/libkcddb/smtpsubmit.cpp
@@ -43,7 +43,7 @@ namespace KCDDB
KIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo)
{
url_.setQuery(TQString("to=%1&subject=cddb %2 %3&from=%4")
- .tqarg(to_, cdInfo.category, cdInfo.id, from_));
+ .arg(to_, cdInfo.category, cdInfo.id, from_));
kdDebug(60010) << "Url is: " << url_.prettyURL() << endl;
return KIO::storedPut(diskData_.utf8(), url_, -1, false, false, false);
diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp
index 3f099c23..63a0951b 100644
--- a/libkcddb/submit.cpp
+++ b/libkcddb/submit.cpp
@@ -57,9 +57,9 @@ namespace KCDDB
CDDB::Result
Submit::parseWrite( const TQString & line )
{
- uint servertqStatus = statusCode( line );
+ uint serverStatus = statusCode( line );
- if ( 320 != servertqStatus )
+ if ( 320 != serverStatus )
return ServerError;
return Success;
@@ -74,10 +74,10 @@ namespace KCDDB
diskData_ += "# Track frame offsets:\n";
for (uint i=0; i < numTracks; i++)
- diskData_ += TQString("#\t%1\n").tqarg(offsetList[i]);
+ diskData_ += TQString("#\t%1\n").arg(offsetList[i]);
int l = offsetList[numTracks+1]/75;
- diskData_ += TQString("# Disc length: %1 seconds\n").tqarg(l);
+ diskData_ += TQString("# Disc length: %1 seconds\n").arg(l);
diskData_ += cdInfo.toString(true);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 18:31:24 +0000