diff options
Diffstat (limited to 'kmrml/kmrml/kcontrol')
| -rw-r--r-- | kmrml/kmrml/kcontrol/indexcleaner.cpp | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/indexer.cpp | 4 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/kcmkmrml.cpp | 14 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/mainpage.cpp | 4 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/serverconfigwidget.ui | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp index 2183cc5b..c184c10c 100644 --- a/kmrml/kmrml/kcontrol/indexcleaner.cpp +++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp @@ -78,7 +78,7 @@ void IndexCleaner::startNext() if ( index != -1 ) cmd.replace( index, 2, TQUOTE( dir ) ); else // no %d? What else can we do? - cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) ); + cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) ); *m_process << cmd; diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp index 09a83c33..3f479ee6 100644 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ b/kmrml/kmrml/kcontrol/indexer.cpp @@ -112,7 +112,7 @@ void Indexer::processNext() *m_process << *it; #endif - emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir )); + emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir )); m_process->start(); } @@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc ) if ( ok ) { uint dirsLeft = m_dirs.count(); - TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles ); + TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles ); emit progress( perc, message ); } } diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index 42aaf534..3e7e91c1 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp @@ -17,7 +17,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kaboutdata.h> #include <kapplication.h> @@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ): ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" ); setAboutData( ab ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setSpacing( KDialog::spacingHint() ); m_mainPage = new MainPage( this, "main page" ); - tqlayout->addWidget( m_mainPage ); + layout->addWidget( m_mainPage ); connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ))); @@ -86,11 +86,11 @@ void KCMKMrml::checkGiftInstallation() KMessageBox::error( this, errorMessage ); m_mainPage->hide(); TQLabel *errorLabel = new TQLabel( errorMessage, this ); - errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); - urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) ); - TQLayout *l = tqlayout(); + TQLayout *l = layout(); l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); l->add( errorLabel ); l->add( urlLabel ); diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index 84ba61a2..ca491ead 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs, { TQStringList result; - TQString slash = TQString::tqfromLatin1("/"); + TQString slash = TQString::fromLatin1("/"); TQStringList::ConstIterator oldIt = oldIndexDirs.begin(); TQString oldDir, newDir; @@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode ) if ( err ) syserr = TQString::fromLocal8Bit( err ); else - syserr = i18n("Unknown error: %1").tqarg( returnCode ); + syserr = i18n("Unknown error: %1").arg( returnCode ); } KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."), diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui index e577b221..5f3a34cd 100644 --- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui +++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>0</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> |