diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:33:07 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 18:07:29 +0200 |
| commit | cc17a105bc9cf5683ff3f208214068c571fcde59 (patch) | |
| tree | b96dcddb68759dec0d35273e6b79f0c7520be820 /kioslave | |
| parent | 558317e518c5c27b0788242b8b9e828fbabb5b89 (diff) | |
| download | tdemultimedia-cc17a105bc9cf5683ff3f208214068c571fcde59.tar.gz tdemultimedia-cc17a105bc9cf5683ff3f208214068c571fcde59.zip | |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 3c299dfe48c0060272c2966fff599b3b417e2ee4)
Diffstat (limited to 'kioslave')
| -rw-r--r-- | kioslave/audiocd/audiocd.cpp | 4 | ||||
| -rw-r--r-- | kioslave/audiocd/kcmaudiocd/audiocdconfig.ui | 8 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/flac/encoderflac.cpp | 2 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/lame/encoderlameconfig.ui | 2 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp index 5c2068b5..0e182aeb 100644 --- a/kioslave/audiocd/audiocd.cpp +++ b/kioslave/audiocd/audiocd.cpp @@ -59,7 +59,7 @@ extern "C" using namespace KIO; using namespace KCDDB; -#define TQFL1(x) TQString::tqfromLatin1(x) +#define TQFL1(x) TQString::fromLatin1(x) #define DEFAULT_CD_DEVICE "/dev/cdrom" #define CDDB_INFORMATION "CDDB Information" @@ -251,7 +251,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) // circumstances, so build a representation from // the unit number and SCSI device name. // - TQString devname = TQString::tqfromLatin1( "/dev/%1%2" ) + TQString devname = TQString::fromLatin1( "/dev/%1%2" ) .tqarg( drive->dev->given_dev_name ) .tqarg( drive->dev->given_unit_number ) ; kdDebug(7117) << " Using derived name " << devname << endl; diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui index 448749a9..505f6616 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>210</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -460,7 +460,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>16</height> @@ -570,7 +570,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp index 6b71d515..dfb4f7ba 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp @@ -80,7 +80,7 @@ static void MetadataCallback (const FLAC__StreamEncoder *encoder, const FLAC__St } /* -static FLAC__SeekableStreamEncoderSeektqStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) +static FLAC__SeekableStreamEncoderSeekStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) {} ; */ diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui index 3951bb00..d2883737 100644 --- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui +++ b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui @@ -244,7 +244,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui index 2d5fd2dc..e442ade2 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui +++ b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>51</height> |