diff options
Diffstat (limited to 'kioslave/audiocd')
| -rw-r--r-- | kioslave/audiocd/audiocd.cpp | 78 | ||||
| -rw-r--r-- | kioslave/audiocd/kcmaudiocd/audiocdconfig.ui | 132 | ||||
| -rw-r--r-- | kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp | 16 | ||||
| -rw-r--r-- | kioslave/audiocd/kcmaudiocd/kcmaudiocd.h | 7 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/audiocdencoder.cpp | 4 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/audiocdencoder.h | 4 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/flac/encoderflac.cpp | 10 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/lame/collectingprocess.cpp | 10 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/lame/collectingprocess.h | 9 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/lame/encoderlame.cpp | 28 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/lame/encoderlame.h | 1 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/lame/encoderlameconfig.ui | 84 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/vorbis/encodervorbis.cpp | 2 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui | 34 | ||||
| -rw-r--r-- | kioslave/audiocd/plugins/wav/encoderwav.cpp | 2 |
15 files changed, 212 insertions, 209 deletions
diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp index d092ffda..43f61d21 100644 --- a/kioslave/audiocd/audiocd.cpp +++ b/kioslave/audiocd/audiocd.cpp @@ -59,7 +59,7 @@ extern "C" using namespace KIO; using namespace KCDDB; -#define QFL1(x) TQString::fromLatin1(x) +#define TQFL1(x) TQString::tqfromLatin1(x) #define DEFAULT_CD_DEVICE "/dev/cdrom" #define CDDB_INFORMATION "CDDB Information" @@ -149,7 +149,7 @@ public: TQString fileNameTemplate; // URL settable TQString albumTemplate; // URL settable TQString rsearch; - TQString rreplace; + TQString rtqreplace; // Current strings for this CD and or cddb selection TQStringList templateTitles; @@ -189,7 +189,7 @@ AudioCDEncoder *AudioCDProtocol::encoderFromExtension(const TQString& extension) AudioCDEncoder *AudioCDProtocol::determineEncoder(const TQString & filename) { int len = filename.length(); - int pos = filename.findRev('.'); + int pos = filename.tqfindRev('.'); return encoderFromExtension(filename.right(len - pos)); } @@ -251,9 +251,9 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) // circumstances, so build a representation from // the unit number and SCSI device name. // - TQString devname = TQString::fromLatin1( "/dev/%1%2" ) - .arg( drive->dev->given_dev_name ) - .arg( drive->dev->given_unit_number ) ; + TQString devname = TQString::tqfromLatin1( "/dev/%1%2" ) + .tqarg( drive->dev->given_dev_name ) + .tqarg( drive->dev->given_unit_number ) ; kdDebug(7117) << " Using derived name " << devname << endl; d->cd.setDevice( devname ); } @@ -326,7 +326,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) TQString name(d->fname); // Remove extension - int dot = name.findRev('.'); + int dot = name.tqfindRev('.'); if (dot >= 0) name.truncate(dot); @@ -365,7 +365,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) d->req_track = -1; // Are we in the directory that lists "full CD" files? - d->req_allTracks = (dname.contains(d->s_fullCD)); + d->req_allTracks = (dname.tqcontains(d->s_fullCD)); kdDebug(7117) << "dir=" << dname << " file=" << d->fname << " req_track=" << d->req_track << " which_dir=" << d->which_dir << " full CD?=" << d->req_allTracks << endl; @@ -397,9 +397,9 @@ void AudioCDProtocol::get(const KURL & url) if (!drive) return; - if( d->fname.contains(i18n(CDDB_INFORMATION))){ + if( d->fname.tqcontains(i18n(CDDB_INFORMATION))){ uint choice = 1; - if(d->fname != TQString("%1.txt").arg(i18n(CDDB_INFORMATION))){ + if(d->fname != TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION))){ choice= d->fname.section('_',1,1).section('.',0,0).toInt(); } uint count = 1; @@ -417,7 +417,7 @@ void AudioCDProtocol::get(const KURL & url) } count++; } - if(!found && d->fname.contains(i18n(CDDB_INFORMATION)+":")){ + if(!found && d->fname.tqcontains(i18n(CDDB_INFORMATION)+":")){ mimeType("text/html"); //data(TQCString( d->fname.latin1() )); // send an empty TQByteArray to signal end of data. @@ -465,7 +465,7 @@ void AudioCDProtocol::get(const KURL & url) unsigned long size = encoder->size(time_secs); totalSize(size); - emit mimeType(QFL1(encoder->mimeType())); + emit mimeType(TQFL1(encoder->mimeType())); // Read data (track/disk) from the cd paranoiaRead(drive, firstSector, lastSector, encoder, url.fileName(), size); @@ -504,7 +504,7 @@ void AudioCDProtocol::stat(const KURL & url) UDSAtom atom; atom.m_uds = KIO::UDS_NAME; - atom.m_str = url.fileName().replace('/', QFL1("%2F")); + atom.m_str = url.fileName().tqreplace('/', TQFL1("%2F")); kdDebug(7117) << k_funcinfo << atom.m_str << endl; entry.append(atom); @@ -610,15 +610,15 @@ void AudioCDProtocol::listDir(const KURL & url) for ( it = d->cddbList.begin(); it != d->cddbList.end(); ++it ){ (*it).toString(); if(count == 1) - app_file(entry, TQString("%1.txt").arg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1); + app_file(entry, TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1); else - app_file(entry, TQString("%1_%2.txt").arg(i18n(CDDB_INFORMATION)).arg(count), ((*it).toString().length())+1); + app_file(entry, TQString("%1_%2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(count), ((*it).toString().length())+1); count++; listEntry(entry, false); } // Error if( count == 1 ) { - app_file(entry, TQString("%1: %2.txt").arg(i18n(CDDB_INFORMATION)).arg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1); + app_file(entry, TQString("%1: %2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1); count++; listEntry(entry, false); } @@ -838,7 +838,7 @@ void AudioCDProtocol::paranoiaRead( if (0 == buf) { kdDebug(7117) << "Unrecoverable error in paranoia_read" << endl; ok = false; - error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).arg( fileName ) ); + error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).tqarg( fileName ) ); break; } @@ -848,7 +848,7 @@ void AudioCDProtocol::paranoiaRead( if(encoderProcessed == -1){ kdDebug(7117) << "Encoder processing error, stopping." << endl; ok = false; - TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).arg( fileName ); + TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName ); TQString details = encoder->lastErrorMessage(); if ( !details.isEmpty() ) errMsg += "\n" + details; @@ -926,7 +926,7 @@ void AudioCDProtocol::paranoiaRead( processedSize(processed); } else if ( ok ) // i.e. no error message already emitted - error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).arg( fileName ) ); + error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName ) ); paranoia_free(paranoia); paranoia = 0; @@ -953,24 +953,24 @@ void AudioCDProtocol::parseURLArgs(const KURL & url) { TQString token(*it); - int equalsPos(token.find('=')); + int equalsPos(token.tqfind('=')); if (-1 == equalsPos) continue; TQString attribute(token.left(equalsPos)); TQString value(token.mid(equalsPos + 1)); - if (attribute == QFL1("device")) + if (attribute == TQFL1("device")) d->device = value; - else if (attribute == QFL1("paranoia_level")) + else if (attribute == TQFL1("paranoia_level")) d->paranoiaLevel = value.toInt(); - else if (attribute == QFL1("fileNameTemplate")) + else if (attribute == TQFL1("fileNameTemplate")) d->fileNameTemplate = value; - else if (attribute == QFL1("albumNameTemplate")) + else if (attribute == TQFL1("albumNameTemplate")) d->albumTemplate = value; - else if (attribute == QFL1("cddbChoice")) + else if (attribute == TQFL1("cddbChoice")) d->cddbUserChoice = value.toInt(); - else if (attribute == QFL1("niceLevel")){ + else if (attribute == TQFL1("niceLevel")){ int niceLevel = value.toInt(); if(setpriority(PRIO_PROCESS, getpid(), niceLevel) != 0) kdDebug(7117) << "Setting nice level to (" << niceLevel << ") failed." << endl; @@ -984,12 +984,12 @@ void AudioCDProtocol::parseURLArgs(const KURL & url) */ void AudioCDProtocol::loadSettings() { - KConfig *config = new KConfig(QFL1("kcmaudiocdrc"), true /*readonly*/, false /*no kdeglobals*/); + KConfig *config = new KConfig(TQFL1("kcmaudiocdrc"), true /*readonly*/, false /*no kdeglobals*/); - config->setGroup(QFL1("CDDA")); + config->setGroup(TQFL1("CDDA")); - if (!config->readBoolEntry(QFL1("autosearch"),true)) { - d->device = config->readEntry(QFL1("device"),QFL1(DEFAULT_CD_DEVICE)); + if (!config->readBoolEntry(TQFL1("autosearch"),true)) { + d->device = config->readEntry(TQFL1("device"),TQFL1(DEFAULT_CD_DEVICE)); } d->paranoiaLevel = 1; // enable paranoia error correction, but allow skipping @@ -1016,7 +1016,7 @@ void AudioCDProtocol::loadSettings() d->fileNameTemplate = config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}"); d->albumTemplate = config->readEntry("album_template", "%{albumartist} - %{albumtitle}"); d->rsearch = config->readEntry("regexp_search"); - d->rreplace = config->readEntry("regexp_replace"); + d->rtqreplace = config->readEntry("regexp_tqreplace"); // if the regular expressions are enclosed in qoutes. remove them // otherwise it is not possible to search for a space " ", since an empty (only spaces) value is not // supported by KConfig, so the space has to be qouted, but then here the regexp searches really for " " @@ -1026,9 +1026,9 @@ void AudioCDProtocol::loadSettings() { d->rsearch=d->rsearch.mid(1, d->rsearch.length()-2); } - if (qoutedString.exactMatch(d->rreplace)) + if (qoutedString.exactMatch(d->rtqreplace)) { - d->rreplace=d->rreplace.mid(1, d->rreplace.length()-2); + d->rtqreplace=d->rtqreplace.mid(1, d->rtqreplace.length()-2); } // Tell the encoders to load their settings @@ -1058,7 +1058,7 @@ void AudioCDProtocol::generateTemplateTitles() { for (unsigned int i = 0; i < d->tracks; i++){ TQString n; - d->templateTitles.append( i18n("Track %1").arg(n.sprintf("%02d", i + 1))); + d->templateTitles.append( i18n("Track %1").tqarg(n.sprintf("%02d", i + 1))); } return; } @@ -1076,12 +1076,12 @@ void AudioCDProtocol::generateTemplateTitles() macros["title"] = (info.trackInfoList[i].title); TQString n; macros["number"] = n.sprintf("%02d", i + 1); - //macros["number"] = TQString("%1").arg(i+1, 2, 10); + //macros["number"] = TQString("%1").tqarg(i+1, 2, 10); macros["genre"] = info.genre; macros["year"] = TQString::number(info.year); - TQString title = KMacroExpander::expandMacros(d->fileNameTemplate, macros, '%').replace('/', QFL1("%2F")); - title.replace( TQRegExp(d->rsearch), d->rreplace ); + TQString title = KMacroExpander::expandMacros(d->fileNameTemplate, macros, '%').tqreplace('/', TQFL1("%2F")); + title.tqreplace( TQRegExp(d->rsearch), d->rtqreplace ); d->templateTitles.append(title); } @@ -1090,8 +1090,8 @@ void AudioCDProtocol::generateTemplateTitles() macros["albumtitle"] = info.title; macros["genre"] = info.genre; macros["year"] = TQString::number(info.year); - d->templateAlbumName = KMacroExpander::expandMacros(d->albumTemplate, macros, '%').replace('/', QFL1("%2F")); - d->templateAlbumName.replace( TQRegExp(d->rsearch), d->rreplace ); + d->templateAlbumName = KMacroExpander::expandMacros(d->albumTemplate, macros, '%').tqreplace('/', TQFL1("%2F")); + d->templateAlbumName.tqreplace( TQRegExp(d->rsearch), d->rtqreplace ); } /** diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui index a742a4cc..271c6261 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AudiocdConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,9 +12,9 @@ <height>563</height> </rect> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -26,7 +26,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -38,11 +38,11 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -63,14 +63,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>210</height> </size> </property> </spacer> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>encoderPriority</cstring> </property> @@ -81,7 +81,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>niceLevel</cstring> </property> @@ -101,7 +101,7 @@ <enum>NoMarks</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -109,31 +109,31 @@ <string>Highest</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Lowest</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Normal</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> </grid> </widget> - <widget class="QLineEdit" row="0" column="2"> + <widget class="TQLineEdit" row="0" column="2"> <property name="name"> <cstring>cd_device_string</cstring> </property> @@ -147,7 +147,7 @@ <string>Specify a location for the drive you want to use. Normally, this is a file inside the /dev folder representing your CD or DVD drive.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cd_specify_device</cstring> </property> @@ -158,7 +158,7 @@ <string>Check this to specify a CD device different from the one which is detected automatically</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>ec_enable_check</cstring> </property> @@ -172,7 +172,7 @@ <string>If you uncheck this option, the slave will not try to use error correction which can be useful for reading damaged CDs. However, this feature can be problematic in some cases, so you can switch it off here.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>ec_skip_check</cstring> </property> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -202,7 +202,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -213,7 +213,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>fileNameGroupBox</cstring> </property> @@ -224,7 +224,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -232,15 +232,15 @@ <string>The following macros will be expanded:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -248,7 +248,7 @@ <string>Genre</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -256,7 +256,7 @@ <string>Track Number</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -264,7 +264,7 @@ <string>%{title}</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -272,7 +272,7 @@ <string>Year</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -280,7 +280,7 @@ <string>Track Title</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -288,7 +288,7 @@ <string>Album Artist</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -296,7 +296,7 @@ <string>%{year}</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -304,7 +304,7 @@ <string>%{albumtitle}</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -312,7 +312,7 @@ <string>Album Title</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -320,7 +320,7 @@ <string>%{genre}</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -328,7 +328,7 @@ <string>%{albumartist}</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -345,7 +345,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -356,7 +356,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -364,7 +364,7 @@ <string>Selection:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -372,11 +372,11 @@ <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines. </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>inputlabel</cstring> </property> @@ -384,7 +384,7 @@ <string>Input:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>outputLabel</cstring> </property> @@ -392,7 +392,7 @@ <string>Output:</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>exampleLabel</cstring> </property> @@ -400,7 +400,7 @@ <string>Example</string> </property> </widget> - <widget class="QLabel" row="6" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>exampleOutput</cstring> </property> @@ -408,7 +408,7 @@ <string>Cool artist - example audio file.wav</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>example</cstring> </property> @@ -416,17 +416,17 @@ <string>Cool artist - example audio file.wav</string> </property> </widget> - <widget class="QLineEdit" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_replaceInput</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>kcfg_replaceOutput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -460,14 +460,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>fileNameGroupBox_2</cstring> </property> @@ -478,7 +478,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fileNameLabel_2</cstring> </property> @@ -486,15 +486,15 @@ <string>The following macros will be expanded:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="1" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel20</cstring> </property> @@ -502,7 +502,7 @@ <string>Year</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel15</cstring> </property> @@ -510,7 +510,7 @@ <string>%{albumartist}</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel16</cstring> </property> @@ -518,7 +518,7 @@ <string>%{year}</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>textLabel21</cstring> </property> @@ -526,7 +526,7 @@ <string>Genre</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel19</cstring> </property> @@ -534,7 +534,7 @@ <string>Album Artist</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel18</cstring> </property> @@ -542,7 +542,7 @@ <string>Album Title</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel17</cstring> </property> @@ -550,7 +550,7 @@ <string>%{genre}</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel14</cstring> </property> @@ -570,7 +570,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -618,10 +618,10 @@ <includes> <include location="global" impldecl="in declaration">kcmodule.h</include> </includes> -<slots> +<Q_SLOTS> <slot>toggleLowpass()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index 87614806..166aa126 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -34,8 +34,8 @@ #include "kcmaudiocd.moc" #include <kconfigdialogmanager.h> -KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) - : AudiocdConfig(parent, name), configChanged(false) +KAudiocdModule::KAudiocdModule(TQWidget *tqparent, const char *name) + : AudiocdConfig(tqparent, name), configChanged(false) { TQString foo = i18n("Report errors found on the cd."); @@ -51,7 +51,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) KConfigSkeleton *config = NULL; TQWidget *widget = encoder->getConfigureWidget(&config); if(widget && config){ - tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type())); + tabWidget->addTab(widget, i18n("%1 Encoder").tqarg(encoder->type())); KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1()); encoderSettings.append(configManager); } @@ -123,7 +123,7 @@ void KAudiocdModule::updateExample() TQString deqoutedReplaceInput=removeQoutes(kcfg_replaceInput->text()); TQString deqoutedReplaceOutput=removeQoutes(kcfg_replaceOutput->text()); - text.replace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput ); + text.tqreplace( TQRegExp(deqoutedReplaceInput), deqoutedReplaceOutput ); exampleOutput->setText(text); } @@ -165,7 +165,7 @@ void KAudiocdModule::save() { replaceOutput=TQString("\"")+replaceOutput+TQString("\""); } config->writeEntry("regexp_search", replaceInput); - config->writeEntry("regexp_replace", replaceOutput); + config->writeEntry("regexp_tqreplace", replaceOutput); } KConfigDialogManager *widget; @@ -204,7 +204,7 @@ void KAudiocdModule::load(bool useDefaults) { fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - %{number} - %{title}")); albumNameLineEdit->setText(config->readEntry("album_name_template", "%{albumartist} - %{albumtitle}")); kcfg_replaceInput->setText(config->readEntry("regexp_search")); - kcfg_replaceOutput->setText(config->readEntry("regexp_replace")); + kcfg_replaceOutput->setText(config->readEntry("regexp_tqreplace")); example->setText(config->readEntry("example", i18n("Cool artist - example audio file.wav"))); } @@ -259,9 +259,9 @@ TQString KAudiocdModule::quickHelp() const extern "C" { - KCModule *create_audiocd(TQWidget *parent, const char */*name*/) + KCModule *create_audiocd(TQWidget *tqparent, const char */*name*/) { - return new KAudiocdModule(parent, "kcmaudiocd"); + return new KAudiocdModule(tqparent, "kcmaudiocd"); } } diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h index 4d51134d..b69a6784 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the Qt - library, treating Qt like a library that normally accompanies the + Permission is also granted to link this program with the TQt + library, treating TQt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ @@ -32,10 +32,11 @@ class KConfigDialogManager; class KAudiocdModule : public AudiocdConfig { Q_OBJECT + TQ_OBJECT public: - KAudiocdModule(TQWidget *parent=0, const char *name=0); + KAudiocdModule(TQWidget *tqparent=0, const char *name=0); ~KAudiocdModule(); TQString quickHelp() const; diff --git a/kioslave/audiocd/plugins/audiocdencoder.cpp b/kioslave/audiocd/plugins/audiocdencoder.cpp index 6dfbec18..200534a4 100644 --- a/kioslave/audiocd/plugins/audiocdencoder.cpp +++ b/kioslave/audiocd/plugins/audiocdencoder.cpp @@ -78,12 +78,12 @@ void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEnco { TQString fileName = *it2; kdDebug() << fileName << endl; - if (foundEncoders.contains(fileName)) { + if (foundEncoders.tqcontains(fileName)) { kdDebug(7117) << "Warning, encoder has been found twice!" << endl; continue; } foundEncoders.append(fileName); - fileName = fileName.mid(0, fileName.find('.')); + fileName = fileName.mid(0, fileName.tqfind('.')); void *function = loadPlugin(fileName); if(function){ void (*functionPointer)(KIO::SlaveBase *, TQPtrList<AudioCDEncoder> &) = (void (*)(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)) function; diff --git a/kioslave/audiocd/plugins/audiocdencoder.h b/kioslave/audiocd/plugins/audiocdencoder.h index cac9b2aa..9f58536f 100644 --- a/kioslave/audiocd/plugins/audiocdencoder.h +++ b/kioslave/audiocd/plugins/audiocdencoder.h @@ -31,7 +31,7 @@ class AudioCDEncoder { public: /** * Constructor. - * @param slave parent that this classes can use to call data() with + * @param slave tqparent that this classes can use to call data() with * when finished encoding bits. */ explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {}; @@ -120,7 +120,7 @@ public: /** * Returns the last error message; called when e.g. read() returns -1. */ - virtual TQString lastErrorMessage() const { return TQString::null; } + virtual TQString lastErrorMessage() const { return TQString(); } /** * Helper function to load all of the AudioCD Encoders from libraries. diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp index 4be1aeb3..fd98f8b4 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp @@ -53,9 +53,9 @@ public: }; #ifdef LEGACY_FLAC -static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) +static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) #else -static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) +static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) #endif { EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data; @@ -80,7 +80,7 @@ static void MetadataCallback (const FLAC__StreamEncoder *encoder, const FLAC__St } /* -static FLAC__SeekableStreamEncoderSeekStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) +static FLAC__SeekableStreamEncoderSeektqStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) {} ; */ @@ -177,14 +177,14 @@ void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c // d->metadata[1] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING); // d->metadata[2] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE) - typedef QPair<TQString, TQVariant> Comment; + typedef TQPair<TQString, TQVariant> Comment; Comment comments[7] = { Comment("Title", info.trackInfoList[track].get("title")), Comment("Artist", info.get("artist")), Comment("Album", info.get("title")), Comment("Genre", info.get("genre")), Comment("Tracknumber", TQString::number(track+1)), Comment("Comment", comment), - Comment("Date", TQString::null )}; + Comment("Date", TQString() )}; if (info.get("Year").toInt() > 0) { TQDateTime dt(TQDate(info.get("Year").toInt(), 1, 1)); comments[6] = Comment("Date", dt.toString(Qt::ISODate)); diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.cpp b/kioslave/audiocd/plugins/lame/collectingprocess.cpp index 42bdf206..58485fa3 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/kioslave/audiocd/plugins/lame/collectingprocess.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,8 @@ struct CollectingProcess::Private { }; -CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) - : KProcess( parent, name ) +CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name ) + : KProcess( tqparent, name ) { d = new Private(); } diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.h b/kioslave/audiocd/plugins/lame/collectingprocess.h index e9f0def4..bd5abca9 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.h +++ b/kioslave/audiocd/plugins/lame/collectingprocess.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,8 +45,9 @@ */ class CollectingProcess : public KProcess { Q_OBJECT + TQ_OBJECT public: - CollectingProcess( TQObject * parent = 0, const char * name = 0 ); + CollectingProcess( TQObject * tqparent = 0, const char * name = 0 ); ~CollectingProcess(); /** Starts the process in NotifyOnExit mode and writes in to stdin of diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp index 5e59c6a4..6154145b 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp @@ -126,31 +126,31 @@ void EncoderLame::loadSettings(){ if (method == 0) { // Constant Bitrate Encoding args.append("-b"); - args.append(TQString("%1").arg(bitrates[settings->cbr_bitrate()])); + args.append(TQString("%1").tqarg(bitrates[settings->cbr_bitrate()])); d->bitrate = bitrates[settings->cbr_bitrate()]; args.append("-q"); - args.append(TQString("%1").arg(quality)); + args.append(TQString("%1").tqarg(quality)); } else { // Variable Bitrate Encoding if (settings->vbr_average_br()) { args.append("--abr"); - args.append(TQString("%1").arg(bitrates[settings->vbr_mean_brate()])); + args.append(TQString("%1").tqarg(bitrates[settings->vbr_mean_brate()])); d->bitrate = bitrates[settings->vbr_mean_brate()]; if (settings->vbr_min_br()){ args.append("-b"); - args.append(TQString("%1").arg(bitrates[settings->vbr_min_brate()])); + args.append(TQString("%1").tqarg(bitrates[settings->vbr_min_brate()])); } if (settings->vbr_min_hard()) args.append("-F"); if (settings->vbr_max_br()){ args.append("-B"); - args.append(TQString("%1").arg(bitrates[settings->vbr_max_brate()])); + args.append(TQString("%1").tqarg(bitrates[settings->vbr_max_brate()])); } } else { d->bitrate = 128; args.append("-V"); - args.append(TQString("%1").arg(quality)); + args.append(TQString("%1").tqarg(quality)); } if ( !settings->vbr_xing_tag() ) args.append("-t"); @@ -186,21 +186,21 @@ void EncoderLame::loadSettings(){ if ( settings->enable_lowpass() ) { args.append("--lowpass"); - args.append(TQString("%1").arg(settings->lowfilterfreq())); + args.append(TQString("%1").tqarg(settings->lowfilterfreq())); if (settings->set_lpf_width()){ args.append("--lowpass-width"); - args.append(TQString("%1").arg(settings->lowfilterwidth())); + args.append(TQString("%1").tqarg(settings->lowfilterwidth())); } } if ( settings->enable_highpass()) { args.append("--hipass"); - args.append(TQString("%1").arg(settings->highfilterfreq())); + args.append(TQString("%1").tqarg(settings->highfilterfreq())); if (settings->set_hpf_width()){ args.append("--hipass-width"); - args.append(TQString("%1").arg(settings->highfilterwidth())); + args.append(TQString("%1").tqarg(settings->highfilterwidth())); } } } @@ -215,7 +215,7 @@ long EncoderLame::readInit(long /*size*/){ TQString prefix = locateLocal("tmp", ""); d->tempFile = new KTempFile(prefix, ".mp3"); d->tempFile->setAutoDelete(true); - d->lastErrorMessage = TQString::null; + d->lastErrorMessage = TQString(); d->processHasExited = false; // -x bitswap @@ -341,16 +341,16 @@ void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c trackInfo.append(info.get("title").toString()); trackInfo.append("--ty"); - trackInfo.append(TQString("%1").arg(info.get("year").toString())); + trackInfo.append(TQString("%1").tqarg(info.get("year").toString())); trackInfo.append("--tc"); trackInfo.append(comment); trackInfo.append("--tn"); - trackInfo.append(TQString("%1").arg(track+1)); + trackInfo.append(TQString("%1").tqarg(track+1)); const TQString genre = info.get( "genre" ).toString(); - if ( d->genreList.find( genre ) != d->genreList.end() ) + if ( d->genreList.tqfind( genre ) != d->genreList.end() ) { trackInfo.append("--tg"); trackInfo.append(genre); diff --git a/kioslave/audiocd/plugins/lame/encoderlame.h b/kioslave/audiocd/plugins/lame/encoderlame.h index ba02cf4f..1f5044b0 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.h +++ b/kioslave/audiocd/plugins/lame/encoderlame.h @@ -30,6 +30,7 @@ class KProcess; class EncoderLame : public TQObject, public AudioCDEncoder { Q_OBJECT + TQ_OBJECT public: EncoderLame(KIO::SlaveBase *slave); diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui index 74060353..7b7dcf17 100644 --- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui +++ b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EncoderLameConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>LameConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>GroupBox1_2</cstring> </property> @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_copyright</cstring> </property> @@ -47,7 +47,7 @@ <string>Mark MP3 file as copyrighted.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_original</cstring> </property> @@ -64,7 +64,7 @@ <string>Mark MP3 file as an original.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_iso</cstring> </property> @@ -78,7 +78,7 @@ <string>This selects the maximal bitrate used for encoding.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_crc</cstring> </property> @@ -86,7 +86,7 @@ <string>&Error protection</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_id3_tag</cstring> </property> @@ -105,7 +105,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -116,7 +116,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout21</cstring> </property> @@ -130,7 +130,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -138,7 +138,7 @@ <string>Low</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>kcfg_quality</cstring> </property> @@ -161,7 +161,7 @@ <enum>NoMarks</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -171,21 +171,21 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> <property name="text"> <string>&Quality:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignLeft</set> </property> <property name="buddy" stdset="0"> <cstring>kcfg_quality</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="1" column="0" rowspan="1" colspan="2"> <item> <property name="text"> <string>Stereo</string> @@ -213,7 +213,7 @@ <string>This option controls whether MP3 files are recorded with one or two channels. Note that choosing <i>"Mono"</i> reduces file size, but also kills the stereo signal.</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>kcfg_bitrate_constant</cstring> </property> @@ -221,7 +221,7 @@ <string>Constant bitrate</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>kcfg_bitrate_variable</cstring> </property> @@ -244,14 +244,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>vbr_settings</cstring> </property> @@ -271,7 +271,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>kcfg_vbr_average_br</cstring> </property> @@ -282,7 +282,7 @@ <string>This selects the maximal bitrate used for encoding.</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -363,7 +363,7 @@ <number>13</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_vbr_max_br</cstring> </property> @@ -377,7 +377,7 @@ <string>This selects the maximal bitrate used for encoding.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_vbr_xing_tag</cstring> </property> @@ -391,7 +391,7 @@ <string>This writes additional information related to VBR as introduced by Xing.</string> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -472,7 +472,7 @@ <number>9</number> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_vbr_min_hard</cstring> </property> @@ -483,7 +483,7 @@ <string>Minimal &value is a hard limit</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_vbr_min_br</cstring> </property> @@ -497,7 +497,7 @@ <string>This selects the minimal bitrate used for encoding.</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -580,7 +580,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cbr_settings</cstring> </property> @@ -597,7 +597,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -608,7 +608,7 @@ <cstring>kcfg_cbr_bitrate</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>32 kbs</string> @@ -691,14 +691,14 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>GroupBox83_2</cstring> </property> <property name="title"> <string>Filter Settings</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -715,7 +715,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_enable_lowpass</cstring> </property> @@ -723,7 +723,7 @@ <string>&Lowpass filter cutoff above</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>kcfg_lowfilterfreq</cstring> </property> @@ -737,7 +737,7 @@ <number>20000</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_enable_highpass</cstring> </property> @@ -745,7 +745,7 @@ <string>&Highpass filter cutoff below</string> </property> </widget> - <widget class="QSpinBox" row="3" column="0"> + <widget class="TQSpinBox" row="3" column="0"> <property name="name"> <cstring>kcfg_highfilterfreq</cstring> </property> @@ -759,7 +759,7 @@ <number>200</number> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>kcfg_set_lpf_width</cstring> </property> @@ -770,7 +770,7 @@ <string>Low&pass filter width</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>kcfg_lowfilterwidth</cstring> </property> @@ -784,7 +784,7 @@ <number>5000</number> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>kcfg_set_hpf_width</cstring> </property> @@ -795,7 +795,7 @@ <string>Highpa&ss filter width</string> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>kcfg_highfilterwidth</cstring> </property> @@ -926,5 +926,5 @@ <tabstop>kcfg_set_hpf_width</tabstop> <tabstop>kcfg_highfilterwidth</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp index 739e1c8f..2caab8e5 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -301,7 +301,7 @@ void EncoderVorbis::fillSongInfo( KCDDB::CDInfo info, int track, const TQString if( !d->write_vorbis_comments ) return; - typedef QPair<TQCString, TQVariant> CommentField; + typedef TQPair<TQCString, TQVariant> CommentField; TQValueList<CommentField> commentFields; commentFields.append(CommentField("title", info.trackInfoList[track].get("title"))); diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui index 17000745..5e057de0 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui +++ b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EncoderVorbisConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>VorbisConfig</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_vorbis_enc_method</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>vorbis_enc_quality</cstring> </property> @@ -38,7 +38,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>vorbis_enc_bitrate</cstring> </property> @@ -48,7 +48,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>vorbis_bitrate_settings</cstring> </property> @@ -68,7 +68,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -149,7 +149,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>32 kbs</string> @@ -230,7 +230,7 @@ <number>13</number> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_set_vorbis_min_br</cstring> </property> @@ -241,7 +241,7 @@ <string>M&inimal bitrate:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_set_vorbis_max_br</cstring> </property> @@ -252,7 +252,7 @@ <string>Ma&ximal bitrate:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>128 kbs</string> @@ -285,7 +285,7 @@ <number>1</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_set_vorbis_nominal_br</cstring> </property> @@ -298,7 +298,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>vorbis_quality_settings</cstring> </property> @@ -340,7 +340,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox193</cstring> </property> @@ -357,7 +357,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_vorbis_comments</cstring> </property> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> @@ -417,7 +417,7 @@ <tabstop>kcfg_vorbis_quality</tabstop> <tabstop>kcfg_vorbis_comments</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kioslave/audiocd/plugins/wav/encoderwav.cpp b/kioslave/audiocd/plugins/wav/encoderwav.cpp index 8052ce41..57e455c1 100644 --- a/kioslave/audiocd/plugins/wav/encoderwav.cpp +++ b/kioslave/audiocd/plugins/wav/encoderwav.cpp @@ -63,7 +63,7 @@ long EncoderWav::readInit(long byteCount){ 0x00, 0x00, 0x00, 0x00 // 40 byteCount }; - Q_INT32 wavSize(byteCount + 44 - 8); + TQ_INT32 wavSize(byteCount + 44 - 8); riffHeader[4] = (wavSize >> 0 ) & 0xff; |