summaryrefslogtreecommitdiffstats
path: root/libkcddb
diff options
context:
space:
mode:
Diffstat (limited to 'libkcddb')
-rw-r--r--libkcddb/asynccddbplookup.cpp8
-rw-r--r--libkcddb/asynchttplookup.cpp12
-rw-r--r--libkcddb/asynchttpsubmit.cpp2
-rw-r--r--libkcddb/asyncsmtpsubmit.cpp4
-rw-r--r--libkcddb/cache.cpp2
-rw-r--r--libkcddb/cache.h4
-rw-r--r--libkcddb/cddb.h2
-rw-r--r--libkcddb/cdinfo.h6
-rw-r--r--libkcddb/cdinfodialogbase.ui8
-rw-r--r--libkcddb/cdinfoencodingwidget.cpp4
-rw-r--r--libkcddb/client.cpp16
-rw-r--r--libkcddb/client.h4
-rw-r--r--libkcddb/config.h2
-rw-r--r--libkcddb/configbase.kcfgc2
-rw-r--r--libkcddb/kcmcddb/cddbconfigwidgetbase.ui4
-rw-r--r--libkcddb/sites.h2
-rw-r--r--libkcddb/test/asynccddblookuptest.cpp6
-rw-r--r--libkcddb/test/asynchttplookuptest.cpp6
-rw-r--r--libkcddb/test/asynchttpsubmittest.cpp6
-rw-r--r--libkcddb/test/asyncsmtpsubmittest.cpp6
20 files changed, 53 insertions, 53 deletions
diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp
index e4642dbe..f5dcf64d 100644
--- a/libkcddb/asynccddbplookup.cpp
+++ b/libkcddb/asynccddbplookup.cpp
@@ -48,12 +48,12 @@ namespace KCDDB
socket_->setBlocking( false );
- connect (socket_, TQT_SIGNAL(gotError(int)), TQT_SLOT(slotGotError(int)));
+ connect (socket_, TQ_SIGNAL(gotError(int)), TQ_SLOT(slotGotError(int)));
- connect (socket_, TQT_SIGNAL( connected(const KResolverEntry &) ),
- TQT_SLOT( slotConnectionSuccess() ) );
+ connect (socket_, TQ_SIGNAL( connected(const KResolverEntry &) ),
+ TQ_SLOT( slotConnectionSuccess() ) );
- connect (socket_, TQT_SIGNAL( readyRead() ), TQT_SLOT( slotReadyRead() ) );
+ connect (socket_, TQ_SIGNAL( readyRead() ), TQ_SLOT( slotReadyRead() ) );
if ( trackOffsetList.count() < 3 )
return UnknownError;
diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp
index b6f26051..3e988f2b 100644
--- a/libkcddb/asynchttplookup.cpp
+++ b/libkcddb/asynchttplookup.cpp
@@ -52,8 +52,8 @@ namespace KCDDB
trackOffsetList_ = trackOffsetList;
- connect( this, TQT_SIGNAL( queryReady() ), TQT_SLOT( slotQueryReady() ) );
- connect( this, TQT_SIGNAL( readReady() ), TQT_SLOT( requestCDInfoForMatch() ) );
+ connect( this, TQ_SIGNAL( queryReady() ), TQ_SLOT( slotQueryReady() ) );
+ connect( this, TQ_SIGNAL( readReady() ), TQ_SLOT( requestCDInfoForMatch() ) );
initURL( hostName, port );
@@ -144,10 +144,10 @@ namespace KCDDB
if ( 0 == job )
return ServerError;
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
return Success;
}
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 246e5804..6201e886 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -36,7 +36,7 @@ namespace KCDDB
CDDB::Result AsyncHTTPSubmit::runJob(TDEIO::Job* job)
{
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotFinished(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotFinished(TDEIO::Job *)));
return CDDB::Success;
}
diff --git a/libkcddb/asyncsmtpsubmit.cpp b/libkcddb/asyncsmtpsubmit.cpp
index 1214e951..305f9ce9 100644
--- a/libkcddb/asyncsmtpsubmit.cpp
+++ b/libkcddb/asyncsmtpsubmit.cpp
@@ -38,8 +38,8 @@ namespace KCDDB
CDDB::Result AsyncSMTPSubmit::runJob(TDEIO::Job* job)
{
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT(slotDone( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT(slotDone( TDEIO::Job* ) ) );
return Success;
}
diff --git a/libkcddb/cache.cpp b/libkcddb/cache.cpp
index 5e57b35a..10aa683a 100644
--- a/libkcddb/cache.cpp
+++ b/libkcddb/cache.cpp
@@ -20,7 +20,7 @@
*/
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <tqdir.h>
diff --git a/libkcddb/cache.h b/libkcddb/cache.h
index 7839ba33..939c9b36 100644
--- a/libkcddb/cache.h
+++ b/libkcddb/cache.h
@@ -26,10 +26,10 @@
#include <tqstring.h>
#include "cdinfo.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace KCDDB
{
- class KDE_EXPORT Cache
+ class TDE_EXPORT Cache
{
public:
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index 1e397467..5f95c815 100644
--- a/libkcddb/cddb.h
+++ b/libkcddb/cddb.h
@@ -43,7 +43,7 @@ namespace KCDDB
/** This is just a container class used for interpreting results
of CDDB queries.
*/
- class KDE_EXPORT CDDB
+ class TDE_EXPORT CDDB
{
public:
diff --git a/libkcddb/cdinfo.h b/libkcddb/cdinfo.h
index cafaab53..15984b11 100644
--- a/libkcddb/cdinfo.h
+++ b/libkcddb/cdinfo.h
@@ -24,7 +24,7 @@
#include <tqstringlist.h>
#include <tqvaluelist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tqvariant.h>
namespace KCDDB
@@ -32,7 +32,7 @@ namespace KCDDB
/**
* Information about a sepecific track in a cd.
*/
- class KDE_EXPORT TrackInfo
+ class TDE_EXPORT TrackInfo
{
public:
@@ -65,7 +65,7 @@ namespace KCDDB
* cddb->lookup(discSignature);
* CDInfo info = cddb->bestLookupResponse();</code>
*/
- class KDE_EXPORT CDInfo
+ class TDE_EXPORT CDInfo
{
public:
diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui
index 65948217..3c6a386f 100644
--- a/libkcddb/cdinfodialogbase.ui
+++ b/libkcddb/cdinfodialogbase.ui
@@ -398,12 +398,12 @@
<variable access="public">static const unsigned TRACK_TITLE = 2;</variable>
<variable access="public">static const unsigned TRACK_COMMENT = 3;</variable>
</variables>
-<Q_SIGNALS>
+<signals>
<signal>play(int i)</signal>
<signal>discInfoClicked()</signal>
<signal>trackInfoClicked(unsigned)</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
<slot access="protected">slotTrackSelected( TQListViewItem * item )</slot>
<slot access="protected">slotNextTrack()</slot>
<slot access="protected">slotTrackDoubleClicked( TQListViewItem * item, const TQPoint &amp;, int column )</slot>
@@ -412,7 +412,7 @@
<slot>genreChanged( const TQString &amp; newGenre )</slot>
<slot>slotMultipleArtists( bool hasMultipleArtist )</slot>
<slot access="private">slotChangeEncoding()</slot>
-</Q_SLOTS>
+</slots>
<functions>
<function access="private" specifier="non virtual">init()</function>
<function access="private" specifier="non virtual">destroy()</function>
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index f2a7e578..6714c56b 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -37,8 +37,8 @@ namespace KCDDB
slotEncodingChanged(encodingCombo->currentText());
- connect(encodingCombo,TQT_SIGNAL(activated(const TQString&)),
- this,TQT_SLOT(slotEncodingChanged(const TQString&)));
+ connect(encodingCombo,TQ_SIGNAL(activated(const TQString&)),
+ this,TQ_SLOT(slotEncodingChanged(const TQString&)));
}
TQString CDInfoEncodingWidget::selectedEncoding()
diff --git a/libkcddb/client.cpp b/libkcddb/client.cpp
index c1a0102a..38ba5aea 100644
--- a/libkcddb/client.cpp
+++ b/libkcddb/client.cpp
@@ -177,16 +177,16 @@ namespace KCDDB
cdInfoLookup = new AsyncCDDBPLookup();
connect( static_cast<AsyncCDDBPLookup *>( cdInfoLookup ),
- TQT_SIGNAL( finished( CDDB::Result ) ),
- TQT_SLOT( slotFinished( CDDB::Result ) ) );
+ TQ_SIGNAL( finished( CDDB::Result ) ),
+ TQ_SLOT( slotFinished( CDDB::Result ) ) );
}
else
{
cdInfoLookup = new AsyncHTTPLookup();
connect( static_cast<AsyncHTTPLookup *>( cdInfoLookup ),
- TQT_SIGNAL( finished( CDDB::Result ) ),
- TQT_SLOT( slotFinished( CDDB::Result ) ) );
+ TQ_SIGNAL( finished( CDDB::Result ) ),
+ TQ_SLOT( slotFinished( CDDB::Result ) ) );
}
r = cdInfoLookup->lookup( d->config.hostname(),
@@ -267,8 +267,8 @@ namespace KCDDB
{
cdInfoSubmit = new AsyncHTTPSubmit(from, hostname, port);
connect( static_cast<AsyncHTTPSubmit *>( cdInfoSubmit ),
- TQT_SIGNAL(finished( CDDB::Result ) ),
- TQT_SLOT( slotSubmitFinished( CDDB::Result ) ) );
+ TQ_SIGNAL(finished( CDDB::Result ) ),
+ TQ_SLOT( slotSubmitFinished( CDDB::Result ) ) );
}
break;
@@ -285,8 +285,8 @@ namespace KCDDB
{
cdInfoSubmit = new AsyncSMTPSubmit( hostname, port, username, from, d->config.submitAddress() );
connect( static_cast<AsyncSMTPSubmit *>( cdInfoSubmit ),
- TQT_SIGNAL( finished( CDDB::Result ) ),
- TQT_SLOT( slotSubmitFinished( CDDB::Result ) ) );
+ TQ_SIGNAL( finished( CDDB::Result ) ),
+ TQ_SLOT( slotSubmitFinished( CDDB::Result ) ) );
}
break;
}
diff --git a/libkcddb/client.h b/libkcddb/client.h
index c28d763e..fd4cdbf5 100644
--- a/libkcddb/client.h
+++ b/libkcddb/client.h
@@ -25,7 +25,7 @@
#include "cdinfo.h"
#include <tqobject.h>
#include "cddb.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace KCDDB
{
@@ -40,7 +40,7 @@ namespace KCDDB
* cddb->lookup(discSignature);
* CDInfo info = cddb->bestLookupResponse();</code>
*/
- class KDE_EXPORT Client : public TQObject
+ class TDE_EXPORT Client : public TQObject
{
TQ_OBJECT
diff --git a/libkcddb/config.h b/libkcddb/config.h
index adfd59f2..1f5ec8a4 100644
--- a/libkcddb/config.h
+++ b/libkcddb/config.h
@@ -30,7 +30,7 @@
#include <tdelibs_export.h>
namespace KCDDB
{
- class KDE_EXPORT Config : public ConfigBase
+ class TDE_EXPORT Config : public ConfigBase
{
public:
Config();
diff --git a/libkcddb/configbase.kcfgc b/libkcddb/configbase.kcfgc
index fe089fc8..0cde4e52 100644
--- a/libkcddb/configbase.kcfgc
+++ b/libkcddb/configbase.kcfgc
@@ -1,4 +1,4 @@
ClassName=ConfigBase
File=libkcddb.kcfg
Mutators=true
-Visibility=KDE_EXPORT
+Visibility=TDE_EXPORT
diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
index 8da249db..8ea060f9 100644
--- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
+++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
@@ -580,11 +580,11 @@
<tabstop>kcfg_port</tabstop>
<tabstop>kcfg_lookupTransport</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">protocolChanged()</slot>
<slot access="protected">showMirrorList()</slot>
<slot access="protected">needAuthenticationChanged(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="11" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/libkcddb/sites.h b/libkcddb/sites.h
index eaa3dacb..c06b1762 100644
--- a/libkcddb/sites.h
+++ b/libkcddb/sites.h
@@ -36,7 +36,7 @@ namespace KCDDB
TQString description;
} ;
- class KDE_EXPORT Sites : public CDDB
+ class TDE_EXPORT Sites : public CDDB
{
public:
Sites();
diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp
index e9100c40..6a43b0ca 100644
--- a/libkcddb/test/asynccddblookuptest.cpp
+++ b/libkcddb/test/asynccddblookuptest.cpp
@@ -22,8 +22,8 @@ AsyncCDDBLookupTest::AsyncCDDBLookupTest()
connect
(
client_,
- TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(slotFinished(CDDB::Result))
+ TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(slotFinished(CDDB::Result))
);
TrackOffsetList list;
@@ -96,7 +96,7 @@ AsyncCDDBLookupTest::slotFinished(CDDB::Result r)
kdDebug() << "Best CDInfo had title: " << i.title << endl;
kdDebug() << "and revision: " << i.revision << endl;
- kapp->quit();
+ tdeApp->quit();
}
int main(int argc, char ** argv)
diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp
index 045e6b15..f614b468 100644
--- a/libkcddb/test/asynchttplookuptest.cpp
+++ b/libkcddb/test/asynchttplookuptest.cpp
@@ -21,8 +21,8 @@ AsyncHTTPLookupTest::AsyncHTTPLookupTest()
connect
(
client_,
- TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(slotFinished(CDDB::Result))
+ TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(slotFinished(CDDB::Result))
);
TrackOffsetList list;
@@ -94,7 +94,7 @@ AsyncHTTPLookupTest::slotFinished(CDDB::Result r)
kdDebug() << "Best CDInfo had title: " << i.title << endl;
kdDebug() << "and revision: " << i.revision << endl;
- kapp->quit();
+ tdeApp->quit();
}
int main(int argc, char ** argv)
diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp
index 0dd0766e..425f5873 100644
--- a/libkcddb/test/asynchttpsubmittest.cpp
+++ b/libkcddb/test/asynchttpsubmittest.cpp
@@ -51,8 +51,8 @@ AsyncHTTPSubmitTest::AsyncHTTPSubmitTest()
connect
(
client_,
- TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(slotFinished(CDDB::Result))
+ TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(slotFinished(CDDB::Result))
);
client_->submit(cdInfo, list);
@@ -63,7 +63,7 @@ AsyncHTTPSubmitTest::slotFinished(CDDB::Result r)
{
kdDebug() << "AsyncHTTPSubmitTest::slotFinished: Got " << KCDDB::CDDB::resultToString(r) << endl;
- kapp->quit();
+ tdeApp->quit();
}
int main(int argc, char ** argv)
diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp
index 72ee0adc..a146bb11 100644
--- a/libkcddb/test/asyncsmtpsubmittest.cpp
+++ b/libkcddb/test/asyncsmtpsubmittest.cpp
@@ -52,8 +52,8 @@ AsyncSMTPSubmitTest::AsyncSMTPSubmitTest()
connect
(
client_,
- TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(slotFinished(CDDB::Result))
+ TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(slotFinished(CDDB::Result))
);
client_->submit(cdInfo, list);
@@ -64,7 +64,7 @@ AsyncSMTPSubmitTest::slotFinished(CDDB::Result r)
{
kdDebug() << "AsyncSMTPSubmitTest::slotFinished: Got " << KCDDB::CDDB::resultToString(r) << endl;
- kapp->quit();
+ tdeApp->quit();
}
int main(int argc, char ** argv)
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-20 03:11:21 +0000