Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/21/head
Michele Calgaro 7 months ago
parent b4a60205a6
commit 5a592028ff
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -513,11 +513,11 @@ or from command line with <command>dcop kaffeine KaffeineIface openURL best_song
<tbody>
<row>
<entry><para><function>void openURL(QString URL)</function></para></entry>
<entry><para><function>void openURL(TQString URL)</function></para></entry>
<entry><para>Opens and plays the given URL.</para></entry>
</row>
<row>
<entry><para><function>void appendURL(QString URL)</function></para></entry>
<entry><para><function>void appendURL(TQString URL)</function></para></entry>
<entry><para>Appends the URL to current playlist.</para></entry>
</row>
<row>
@ -550,10 +550,10 @@ or from command line with <command>dcop kaffeine KaffeineIface openURL best_song
<row><entry><para><function>void stop()</function></para></entry>
<entry><para>Stops playback.</para></entry>
</row>
<row><entry><para><function>QString title()</function></para></entry>
<row><entry><para><function>TQString title()</function></para></entry>
<entry><para>Returns the title of the current track.</para></entry>
</row>
<row><entry><para><function>QString getFileName()</function></para></entry>
<row><entry><para><function>TQString getFileName()</function></para></entry>
<entry><para>Returns filename of current track.</para></entry>
</row>
<row><entry><para><function>int getLength()</function></para></entry>

@ -3,7 +3,7 @@ Index: src/player-parts/xine-part/xine_part.h
--- src/player-parts/xine-part/xine_part.h (revision 746328)
+++ src/player-parts/xine-part/xine_part.h (working copy)
@@ -108,6 +108,8 @@
QString screenShot();
TQString screenShot();
void nextAudioChannel();
void nextSubtitleChannel();
+ void speedFaster();

@ -5,10 +5,10 @@
<name>Kaffeine</name>
<author>Gav Wood,Jürgen Kofler</author>
<action objid="KaffeineIface" prototype="void openURL(QString)">
<action objid="KaffeineIface" prototype="void openURL(TQString)">
<name>Play URL</name>
<comment>Starts playback of a specific URL.</comment>
<argument type="QString">
<argument type="TQString">
<comment>The URL to be played.</comment>
</argument>
</action>
@ -36,7 +36,7 @@
<name>Change Playlist</name>
<comment>Change to the next kaffeine playlist.</comment>
</action>
<action objid="KaffeineIface" prototype="QString title()">
<action objid="KaffeineIface" prototype="TQString title()">
<name>Get Title</name>
<comment>Returns the title of current track.</comment>
</action>

@ -25,7 +25,7 @@ class MyPlayer : public MainWindow
MyPlayer();
~MyPlayer();
void loadURL(const QString&);
void loadURL(const TQString&);
//...
private:
@ -50,7 +50,7 @@ MyPlayer::MyPlayer() : TDEMainWindow(0)
//..
}
void MyPlayer::loadURL(const QString& url)
void MyPlayer::loadURL(const TQString& url)
{
m_player->openURL(url);
}

@ -37,7 +37,7 @@ diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.cpp kaffeine-0.8.
}
@@ -248,6 +248,7 @@
bool DVBout::doPause( const QString &name ) // called from dvbstream::run()
bool DVBout::doPause( const TQString &name ) // called from dvbstream::run()
{
+ fprintf(stderr,"DVBout::doPause\n");
if ( !haveLive )
@ -73,7 +73,7 @@ diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.cpp kaffeine-0.8.
return true;
@@ -288,11 +279,10 @@
bool DVBout::goLive( const QString &name )
bool DVBout::goLive( const TQString &name )
{
- if ( fdPipe ) return false;
-
@ -239,21 +239,21 @@ diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.h kaffeine-0.8.4.
class KaffeineDvbPlugin;
-class DVBout : public QObject, public QThread
+class DVBout : public QObject, private QThread
-class DVBout : public TQObject, public QThread
+class DVBout : public TQObject, private QThread
{
TQ_OBJECT
@@ -77,13 +77,13 @@
void writePat();
void calculateCRC( unsigned char *p_begin, unsigned char *p_end );
void renameFile( QString &name, const QString &ext );
void renameFile( TQString &name, const TQString &ext );
+ bool writeBytes(int fd, const unsigned char *buf, int bytes);
int pmtpid;
bool patpmt, wpatpmt;
bool timeShifting;
QString pipeName;
TQString pipeName;
QFile outFile, liveFile;
- int fdPipe;
Ts2Rtp *rtp;

Loading…
Cancel
Save