diff options
Diffstat (limited to 'libkcddb')
52 files changed, 60 insertions, 118 deletions
diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp index 85c55519..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; @@ -348,5 +348,3 @@ namespace KCDDB #include "asynccddbplookup.moc" - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/asynccddbplookup.h b/libkcddb/asynccddbplookup.h index a1e55893..f4f5d8cb 100644 --- a/libkcddb/asynccddbplookup.h +++ b/libkcddb/asynccddbplookup.h @@ -29,7 +29,7 @@ namespace KCDDB { class AsyncCDDBPLookup : public CDDBPLookup { - Q_OBJECT + TQ_OBJECT public: @@ -92,4 +92,3 @@ namespace KCDDB } #endif // KCDDB_ASYNC_CDDBP_LOOKUP_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp index 5bcf1f76..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; } @@ -155,5 +155,3 @@ namespace KCDDB } #include "asynchttplookup.moc" - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/asynchttplookup.h b/libkcddb/asynchttplookup.h index 1baaafd5..ad27e6fc 100644 --- a/libkcddb/asynchttplookup.h +++ b/libkcddb/asynchttplookup.h @@ -28,7 +28,7 @@ namespace KCDDB class AsyncHTTPLookup : public HTTPLookup { - Q_OBJECT + TQ_OBJECT public: @@ -59,5 +59,3 @@ namespace KCDDB } #endif // KCDDB_ASYNC_HTTP_LOOKUP_H - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 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/asynchttpsubmit.h b/libkcddb/asynchttpsubmit.h index 0eb82ae7..6c21954c 100644 --- a/libkcddb/asynchttpsubmit.h +++ b/libkcddb/asynchttpsubmit.h @@ -25,7 +25,7 @@ namespace KCDDB { class AsyncHTTPSubmit : public HTTPSubmit { - Q_OBJECT + TQ_OBJECT public: AsyncHTTPSubmit(const TQString& from, const TQString& hostname, uint port); 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/asyncsmtpsubmit.h b/libkcddb/asyncsmtpsubmit.h index 17351497..710b6e06 100644 --- a/libkcddb/asyncsmtpsubmit.h +++ b/libkcddb/asyncsmtpsubmit.h @@ -26,7 +26,7 @@ namespace KCDDB { class AsyncSMTPSubmit : public SMTPSubmit { - Q_OBJECT + TQ_OBJECT public: @@ -44,4 +44,3 @@ namespace KCDDB } #endif // ASYNCSMTPSUBMIT_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/cache.cpp b/libkcddb/cache.cpp index 127fc6ba..5e57b35a 100644 --- a/libkcddb/cache.cpp +++ b/libkcddb/cache.cpp @@ -127,5 +127,3 @@ namespace KCDDB } } } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/cache.h b/libkcddb/cache.h index 5ccf3775..7839ba33 100644 --- a/libkcddb/cache.h +++ b/libkcddb/cache.h @@ -54,4 +54,3 @@ namespace KCDDB } #endif // KCDDB_CACHE_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp index 23b429ab..841d5215 100644 --- a/libkcddb/cddb.cpp +++ b/libkcddb/cddb.cpp @@ -223,5 +223,3 @@ namespace KCDDB } }*/ } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h index 38daf164..1e397467 100644 --- a/libkcddb/cddb.h +++ b/libkcddb/cddb.h @@ -88,5 +88,3 @@ namespace KCDDB } #endif // KCDDB_CDDB_H - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp index 839d2650..3eee3125 100644 --- a/libkcddb/cddbplookup.cpp +++ b/libkcddb/cddbplookup.cpp @@ -109,5 +109,3 @@ namespace KCDDB return socket_->writeBlock( buf.data(), buf.length() ); } } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/cddbplookup.h b/libkcddb/cddbplookup.h index 0d55407e..a4f4993f 100644 --- a/libkcddb/cddbplookup.h +++ b/libkcddb/cddbplookup.h @@ -52,5 +52,3 @@ namespace KCDDB } #endif - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp index 43346b46..f41b2f2c 100644 --- a/libkcddb/cdinfo.cpp +++ b/libkcddb/cdinfo.cpp @@ -335,5 +335,3 @@ namespace KCDDB return TQVariant(); } } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/cdinfo.h b/libkcddb/cdinfo.h index afa66adc..cafaab53 100644 --- a/libkcddb/cdinfo.h +++ b/libkcddb/cdinfo.h @@ -143,4 +143,3 @@ namespace KCDDB } #endif // KCDDB_CDINFO_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 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 &, int column )</slot> @@ -412,7 +412,7 @@ <slot>genreChanged( const TQString & 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/cdinfoencodingwidget.h b/libkcddb/cdinfoencodingwidget.h index 36508475..32965907 100644 --- a/libkcddb/cdinfoencodingwidget.h +++ b/libkcddb/cdinfoencodingwidget.h @@ -26,7 +26,7 @@ namespace KCDDB { class CDInfoEncodingWidget : public CDInfoEncodingWidgetBase { - Q_OBJECT + TQ_OBJECT public: CDInfoEncodingWidget(TQWidget* parent, const TQString& artist, const TQString& title, diff --git a/libkcddb/client.cpp b/libkcddb/client.cpp index 9a06f04d..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; } @@ -310,6 +310,3 @@ namespace KCDDB } #include "client.moc" - - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/client.h b/libkcddb/client.h index 3488a960..c28d763e 100644 --- a/libkcddb/client.h +++ b/libkcddb/client.h @@ -42,7 +42,7 @@ namespace KCDDB */ class KDE_EXPORT Client : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -102,4 +102,3 @@ namespace KCDDB } #endif // KCDDB_CLIENT_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/config.cpp b/libkcddb/config.cpp index 41be28cb..2921c781 100644 --- a/libkcddb/config.cpp +++ b/libkcddb/config.cpp @@ -52,5 +52,3 @@ namespace KCDDB readConfig(); } } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/config.h b/libkcddb/config.h index 56fc915b..adfd59f2 100644 --- a/libkcddb/config.h +++ b/libkcddb/config.h @@ -42,4 +42,3 @@ namespace KCDDB } #endif // KCDDB_CONFIG_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp index af785854..8804505c 100644 --- a/libkcddb/httplookup.cpp +++ b/libkcddb/httplookup.cpp @@ -182,5 +182,3 @@ namespace KCDDB } #include "httplookup.moc" - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/httplookup.h b/libkcddb/httplookup.h index d7499b49..57f0f06c 100644 --- a/libkcddb/httplookup.h +++ b/libkcddb/httplookup.h @@ -37,7 +37,7 @@ namespace KCDDB class HTTPLookup : public Lookup { - Q_OBJECT + TQ_OBJECT public: @@ -79,5 +79,3 @@ namespace KCDDB } #endif - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp index 0de1f7ba..381a2867 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.cpp +++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp @@ -102,7 +102,4 @@ void CDDBConfigWidget::needAuthenticationChanged(bool needsAuth) if (!needsAuth) kcfg_smtpUsername->clear(); } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 - #include "cddbconfigwidget.moc" diff --git a/libkcddb/kcmcddb/cddbconfigwidget.h b/libkcddb/kcmcddb/cddbconfigwidget.h index cf0d9e0d..515ae811 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.h +++ b/libkcddb/kcmcddb/cddbconfigwidget.h @@ -26,7 +26,7 @@ class CDDBConfigWidget : public CDDBConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: @@ -43,4 +43,3 @@ class CDDBConfigWidget : public CDDBConfigWidgetBase }; #endif // CDDB_CONFIG_WIDGET_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui index 0c40d8a1..8ea060f9 100644 --- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui +++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui @@ -212,7 +212,7 @@ </sizepolicy> </property> <property name="text"> - <string>freedb.freedb.org</string> + <string>gnudb.gnudb.org</string> </property> <property name="whatsThis" stdset="0"> <string>Name of CDDB server which will be used to look up CD information.</string> @@ -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/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index 62e043b4..c9fea30f 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -138,8 +138,4 @@ TQString CDDBModule::handbookSection() const else return TQString::null; } - - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 - #include "kcmcddb.moc" diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h index 3f983d82..2ef3f245 100644 --- a/libkcddb/kcmcddb/kcmcddb.h +++ b/libkcddb/kcmcddb/kcmcddb.h @@ -29,7 +29,7 @@ class TDEConfigDialogManager; class CDDBModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -54,4 +54,3 @@ class CDDBModule : public TDECModule }; #endif // KCMCDDB_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/libkcddb.kcfg b/libkcddb/libkcddb.kcfg index 938ac306..54ee70ad 100644 --- a/libkcddb/libkcddb.kcfg +++ b/libkcddb/libkcddb.kcfg @@ -7,7 +7,7 @@ <kcfgfile name="kcmcddbrc"/> <group name="Lookup"> <entry name="hostname" type="String"> - <default>freedb.freedb.org</default> + <default>gnudb.gnudb.org</default> </entry> <entry name="port" type="Int"> <default>80</default> @@ -42,7 +42,7 @@ <entry name="emailAddress" type="String"> </entry> <entry name="httpSubmitServer" type="String"> - <default>freedb.freedb.org</default> + <default>gnudb.gnudb.org</default> </entry> <entry name="httpSubmitPort" type="Int"> <default>80</default> diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp index e353ece9..38f5a694 100644 --- a/libkcddb/lookup.cpp +++ b/libkcddb/lookup.cpp @@ -43,7 +43,7 @@ namespace KCDDB if ( 200 == serverStatus ) { TQStringList tokenList = TQStringList::split( ' ', line ); - matchList_.append( tqMakePair( tokenList[ 1 ], tokenList[ 2 ] ) ); + matchList_.append( qMakePair( tokenList[ 1 ], tokenList[ 2 ] ) ); return Success; } else if ( ( 211 == serverStatus ) || ( 210 == serverStatus ) ) @@ -62,7 +62,7 @@ namespace KCDDB Lookup::parseExtraMatch( const TQString & line ) { TQStringList tokenList = TQStringList::split( ' ', line ); - matchList_.append( tqMakePair( tokenList[ 0 ], tokenList[ 1 ] ) ); + matchList_.append( qMakePair( tokenList[ 0 ], tokenList[ 1 ] ) ); } CDDB::Result @@ -83,5 +83,3 @@ namespace KCDDB } } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/lookup.h b/libkcddb/lookup.h index c11ad8e6..c253b6b4 100644 --- a/libkcddb/lookup.h +++ b/libkcddb/lookup.h @@ -62,4 +62,3 @@ namespace KCDDB } #endif // KCDDB_LOOKUP_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp index 56cc5eb6..200ad6b1 100644 --- a/libkcddb/sites.cpp +++ b/libkcddb/sites.cpp @@ -37,7 +37,7 @@ namespace KCDDB { KURL url; url.setProtocol( "http" ); - url.setHost( "freedb.freedb.org" ); + url.setHost( "gnudb.gnudb.org" ); url.setPort( 80 ); url.setPath( "/~cddb/cddb.cgi" ); diff --git a/libkcddb/sites.h b/libkcddb/sites.h index 060240c6..eaa3dacb 100644 --- a/libkcddb/sites.h +++ b/libkcddb/sites.h @@ -49,5 +49,3 @@ namespace KCDDB } #endif - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp index 26a70283..e92437df 100644 --- a/libkcddb/submit.cpp +++ b/libkcddb/submit.cpp @@ -97,5 +97,3 @@ namespace KCDDB return false; } } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/submit.h b/libkcddb/submit.h index 60f43b43..f13ae265 100644 --- a/libkcddb/submit.h +++ b/libkcddb/submit.h @@ -62,4 +62,3 @@ namespace KCDDB } #endif // KCDDB_SUBMIT_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/synccddbplookup.cpp b/libkcddb/synccddbplookup.cpp index f215716b..02620a15 100644 --- a/libkcddb/synccddbplookup.cpp +++ b/libkcddb/synccddbplookup.cpp @@ -218,5 +218,3 @@ namespace KCDDB return TQString::fromUtf8(socket_->readLine()); } } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/synccddbplookup.h b/libkcddb/synccddbplookup.h index 75395813..192f9073 100644 --- a/libkcddb/synccddbplookup.h +++ b/libkcddb/synccddbplookup.h @@ -48,4 +48,3 @@ namespace KCDDB } #endif // KCDDB_SYNC_CDDBP_LOOKUP_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/synchttplookup.cpp b/libkcddb/synchttplookup.cpp index 42c45aba..38a22110 100644 --- a/libkcddb/synchttplookup.cpp +++ b/libkcddb/synchttplookup.cpp @@ -127,5 +127,3 @@ namespace KCDDB return Success; } } - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/synchttplookup.h b/libkcddb/synchttplookup.h index 937a1aa9..2cb59f5a 100644 --- a/libkcddb/synchttplookup.h +++ b/libkcddb/synchttplookup.h @@ -46,5 +46,3 @@ namespace KCDDB } #endif // KCDDB_SYNC_HTTP_LOOKUP_H - -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/syncsmtpsubmit.h b/libkcddb/syncsmtpsubmit.h index a6fb23df..eafb5d1e 100644 --- a/libkcddb/syncsmtpsubmit.h +++ b/libkcddb/syncsmtpsubmit.h @@ -35,4 +35,3 @@ namespace KCDDB } #endif // SYNCSMTPSUBMIT_H -// vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp index 9699f54f..1910527b 100644 --- a/libkcddb/test/asynccddblookuptest.cpp +++ b/libkcddb/test/asynccddblookuptest.cpp @@ -13,7 +13,7 @@ AsyncCDDBLookupTest::AsyncCDDBLookupTest() using namespace KCDDB; client_ = new Client; - client_->config().setHostname("freedb.freedb.org"); + client_->config().setHostname("gnudb.gnudb.org"); client_->config().setPort(8880); client_->config().setCachePolicy(Cache::Ignore); client_->config().setLookupTransport(Lookup::CDDBP); @@ -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; diff --git a/libkcddb/test/asynccddblookuptest.h b/libkcddb/test/asynccddblookuptest.h index 459799e5..db139bc7 100644 --- a/libkcddb/test/asynccddblookuptest.h +++ b/libkcddb/test/asynccddblookuptest.h @@ -8,7 +8,7 @@ using namespace KCDDB; class AsyncCDDBLookupTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp index 3cba7d7b..a86d4a66 100644 --- a/libkcddb/test/asynchttplookuptest.cpp +++ b/libkcddb/test/asynchttplookuptest.cpp @@ -12,7 +12,7 @@ AsyncHTTPLookupTest::AsyncHTTPLookupTest() using namespace KCDDB; client_ = new Client; - client_->config().setHostname("freedb.freedb.org"); + client_->config().setHostname("gnudb.gnudb.org"); client_->config().setPort(80); client_->config().setCachePolicy(Cache::Ignore); client_->config().setLookupTransport(Lookup::HTTP); @@ -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; diff --git a/libkcddb/test/asynchttplookuptest.h b/libkcddb/test/asynchttplookuptest.h index b11c3893..4756b909 100644 --- a/libkcddb/test/asynchttplookuptest.h +++ b/libkcddb/test/asynchttplookuptest.h @@ -8,7 +8,7 @@ using namespace KCDDB; class AsyncHTTPLookupTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp index 0dd0766e..ace90808 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); diff --git a/libkcddb/test/asynchttpsubmittest.h b/libkcddb/test/asynchttpsubmittest.h index bbcf8059..270483e0 100644 --- a/libkcddb/test/asynchttpsubmittest.h +++ b/libkcddb/test/asynchttpsubmittest.h @@ -8,7 +8,7 @@ using namespace KCDDB; class AsyncHTTPSubmitTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp index 72ee0adc..90f6fddd 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); diff --git a/libkcddb/test/asyncsmtpsubmittest.h b/libkcddb/test/asyncsmtpsubmittest.h index d3b68bfc..77eba500 100644 --- a/libkcddb/test/asyncsmtpsubmittest.h +++ b/libkcddb/test/asyncsmtpsubmittest.h @@ -8,7 +8,7 @@ using namespace KCDDB; class AsyncSMTPSubmitTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libkcddb/test/synccddblookuptest.cpp b/libkcddb/test/synccddblookuptest.cpp index c2c86618..b308cbef 100644 --- a/libkcddb/test/synccddblookuptest.cpp +++ b/libkcddb/test/synccddblookuptest.cpp @@ -17,7 +17,7 @@ main(int argc, char ** argv) using namespace KCDDB; Client c; - c.config().setHostname("freedb.freedb.org"); + c.config().setHostname("gnudb.gnudb.org"); c.config().setPort(8880); c.config().setCachePolicy(Cache::Ignore); c.config().setLookupTransport(Lookup::CDDBP); diff --git a/libkcddb/test/synchttplookuptest.cpp b/libkcddb/test/synchttplookuptest.cpp index 15e76ee8..74ec6bb3 100644 --- a/libkcddb/test/synchttplookuptest.cpp +++ b/libkcddb/test/synchttplookuptest.cpp @@ -16,7 +16,7 @@ main(int argc, char ** argv) using namespace KCDDB; Client c; - c.config().setHostname("freedb.freedb.org"); + c.config().setHostname("gnudb.gnudb.org"); c.config().setPort(80); c.config().setCachePolicy(Cache::Ignore); c.config().setLookupTransport(Lookup::HTTP); |