diff options
Diffstat (limited to 'kmrml/kmrml/kcontrol')
| -rw-r--r-- | kmrml/kmrml/kcontrol/indexcleaner.cpp | 16 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/indexcleaner.h | 10 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/indexer.cpp | 46 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/indexer.h | 12 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/indextest.cpp | 8 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/indextest.h | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/kcmkmrml.cpp | 36 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/kcmkmrml.h | 4 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/mainpage.cpp | 138 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/mainpage.h | 20 |
10 files changed, 146 insertions, 146 deletions
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp index 5f5eea93..56e606aa 100644 --- a/kmrml/kmrml/kcontrol/indexcleaner.cpp +++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp @@ -13,10 +13,10 @@ using namespace KMrmlConfig; -IndexCleaner::IndexCleaner( const QStringList& dirs, +IndexCleaner::IndexCleaner( const TQStringList& dirs, const KMrml::Config *config, - QObject *parent, const char *name ) - : QObject( parent, name ), + TQObject *parent, const char *name ) + : TQObject( parent, name ), m_dirs( dirs ), m_config( config ), m_process( 0L ) @@ -66,19 +66,19 @@ void IndexCleaner::startNext() m_process = new KProcess(); m_process->setUseShell( true ); #endif - connect( m_process, SIGNAL( processExited( KProcess * )), - SLOT( slotExited( KProcess * ) )); + connect( m_process, TQT_SIGNAL( processExited( KProcess * )), + TQT_SLOT( slotExited( KProcess * ) )); - QString cmd = m_config->removeCollectionCommandLine(); + TQString cmd = m_config->removeCollectionCommandLine(); - QString dir = m_dirs.first(); + TQString dir = m_dirs.first(); m_dirs.pop_front(); int index = cmd.find( "%d" ); if ( index != -1 ) cmd.replace( index, 2, QUOTE( dir ) ); else // no %d? What else can we do? - cmd.append( QString::fromLatin1(" ") + QUOTE( dir ) ); + cmd.append( TQString::fromLatin1(" ") + QUOTE( dir ) ); *m_process << cmd; diff --git a/kmrml/kmrml/kcontrol/indexcleaner.h b/kmrml/kmrml/kcontrol/indexcleaner.h index 0ddcaac4..92dcdc22 100644 --- a/kmrml/kmrml/kcontrol/indexcleaner.h +++ b/kmrml/kmrml/kcontrol/indexcleaner.h @@ -8,8 +8,8 @@ #ifndef INDEXCLEANER_H #define INDEXCLEANER_H -#include <qobject.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstringlist.h> class KProcess; @@ -25,8 +25,8 @@ namespace KMrmlConfig Q_OBJECT public: - IndexCleaner( const QStringList& dirs, const KMrml::Config *config, - QObject *parent = 0, const char *name = 0 ); + IndexCleaner( const TQStringList& dirs, const KMrml::Config *config, + TQObject *parent = 0, const char *name = 0 ); ~IndexCleaner(); void start(); @@ -42,7 +42,7 @@ namespace KMrmlConfig int m_stepSize; void startNext(); - QStringList m_dirs; + TQStringList m_dirs; const KMrml::Config *m_config; KProcess *m_process; }; diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp index a3bb6b7d..f4c4b108 100644 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ b/kmrml/kmrml/kcontrol/indexer.cpp @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#include <qfile.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqregexp.h> #include <kdebug.h> #include <klocale.h> @@ -36,8 +36,8 @@ using namespace KMrmlConfig; Indexer::Indexer( const KMrml::Config* config, - QObject *parent, const char *name ) - : QObject( parent, name ), + TQObject *parent, const char *name ) + : TQObject( parent, name ), m_config( config ), m_dirCount( 0 ) { @@ -46,10 +46,10 @@ Indexer::Indexer( const KMrml::Config* config, m_process->setUseShell( true ); #endif m_process->setEnvironment( "LC_ALL", "C" ); - connect( m_process, SIGNAL( processExited( KProcess * )), - SLOT( processFinished( KProcess * ))); - connect( m_process, SIGNAL( readReady( KProcIO * )), - SLOT( slotCanRead( KProcIO * )) ); + connect( m_process, TQT_SIGNAL( processExited( KProcess * )), + TQT_SLOT( processFinished( KProcess * ))); + connect( m_process, TQT_SIGNAL( readReady( KProcIO * )), + TQT_SLOT( slotCanRead( KProcIO * )) ); } Indexer::~Indexer() @@ -57,7 +57,7 @@ Indexer::~Indexer() delete m_process; } -void Indexer::startIndexing( const QStringList& dirs ) +void Indexer::startIndexing( const TQStringList& dirs ) { if ( m_process->isRunning() ) return; @@ -91,11 +91,11 @@ void Indexer::processNext() m_process->resetAll(); - QString cmd = m_config->addCollectionCommandLine().simplifyWhiteSpace().stripWhiteSpace(); + TQString cmd = m_config->addCollectionCommandLine().simplifyWhiteSpace().stripWhiteSpace(); // in the commandline, replace %d with the directory to process and // %t with the thumbnail dir - int index = cmd.find( "%d" ); // ### QFile::encodeName()? + int index = cmd.find( "%d" ); // ### TQFile::encodeName()? if ( index != -1 ) cmd.replace( index, 2, QUOTE( m_currentDir ) ); index = cmd.find( "%t" ); @@ -106,8 +106,8 @@ void Indexer::processNext() #if KDE_VERSION >= 306 *m_process << cmd; #else - QStringList params = QStringList::split( ' ', cmd ); - QStringList::Iterator it = params.begin(); + TQStringList params = TQStringList::split( ' ', cmd ); + TQStringList::Iterator it = params.begin(); for ( ; it != params.end(); ++it ) *m_process << *it; #endif @@ -118,11 +118,11 @@ void Indexer::processNext() void Indexer::slotCanRead( KProcIO *proc ) { - static const QString& sprogress = KGlobal::staticQString("PROGRESS: "); - static const QString& r1 = /* PROGRESS: 1 of 6 done (15%) */ + static const TQString& sprogress = KGlobal::staticQString("PROGRESS: "); + static const TQString& r1 = /* PROGRESS: 1 of 6 done (15%) */ KGlobal::staticQString( "(\\d+) of (\\d+) done \\((\\d+)%\\)" ); - QString line; + TQString line; int bytes = -1; while ( (bytes = proc->readln( line )) != -1 ) { @@ -146,13 +146,13 @@ void Indexer::slotCanRead( KProcIO *proc ) // case 1: image processing, below 99% if ( line.at( line.length() -1 ) == ')' ) { - QRegExp regxp( r1 ); + TQRegExp regxp( r1 ); int pos = regxp.search( line ); if ( pos > -1 ) { - QString currentFile = regxp.cap( 1 ); - QString numFiles = regxp.cap( 2 ); - QString percent = regxp.cap( 3 ); + TQString currentFile = regxp.cap( 1 ); + TQString numFiles = regxp.cap( 2 ); + TQString percent = regxp.cap( 3 ); // qDebug( "current: %s, number: %s, percent: %s", currentFile.latin1(), numFiles.latin1(), percent.latin1()); bool ok = false; @@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc ) if ( ok ) { uint dirsLeft = m_dirs.count(); - QString 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 ); + 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 ); } } @@ -170,13 +170,13 @@ void Indexer::slotCanRead( KProcIO *proc ) // case 2: file writing, 99% or done, 100% else { - QString percent = line.left( line.length() - 1 ); + TQString percent = line.left( line.length() - 1 ); bool ok = false; int number = percent.toInt( &ok ); if ( ok ) { - QString message = (number == 100) ? + TQString message = (number == 100) ? i18n("Finished.") : i18n("Writing data..."); emit progress( number, message ); } diff --git a/kmrml/kmrml/kcontrol/indexer.h b/kmrml/kmrml/kcontrol/indexer.h index 97335a70..290c9937 100644 --- a/kmrml/kmrml/kcontrol/indexer.h +++ b/kmrml/kmrml/kcontrol/indexer.h @@ -19,7 +19,7 @@ #ifndef INDEXER_H #define INDEXER_H -#include <qobject.h> +#include <tqobject.h> #include <kmrml_config.h> @@ -34,14 +34,14 @@ namespace KMrmlConfig public: Indexer( const KMrml::Config *config, - QObject *parent = 0L, const char *name = 0 ); + TQObject *parent = 0L, const char *name = 0 ); ~Indexer(); - void startIndexing( const QStringList& dirs ); + void startIndexing( const TQStringList& dirs ); void stop(); signals: - void progress( int percent, const QString& text ); + void progress( int percent, const TQString& text ); void finished( int returnCode ); @@ -56,8 +56,8 @@ namespace KMrmlConfig const KMrml::Config *m_config; uint m_dirCount; - QStringList m_dirs; - QString m_currentDir; + TQStringList m_dirs; + TQString m_currentDir; }; diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp index 161ca798..fdaffcde 100644 --- a/kmrml/kmrml/kcontrol/indextest.cpp +++ b/kmrml/kmrml/kcontrol/indextest.cpp @@ -12,9 +12,9 @@ IndexTest::IndexTest() { KMrml::Config *config = new KMrml::Config( KGlobal::config() ); Indexer *indexer = new Indexer( *config, this ); - connect( indexer, SIGNAL( finished( bool )), SLOT( slotFinished( bool ))); - connect( indexer, SIGNAL( progress( int, const QString& )), - SLOT( slotProgress( int, const QString& ))); + connect( indexer, TQT_SIGNAL( finished( bool )), TQT_SLOT( slotFinished( bool ))); + connect( indexer, TQT_SIGNAL( progress( int, const TQString& )), + TQT_SLOT( slotProgress( int, const TQString& ))); indexer->startIndexing( "/home/gis/testcoll" ); } @@ -29,7 +29,7 @@ void IndexTest::slotFinished( bool success ) qDebug("##### FINISHED: %i", success ); } -void IndexTest::slotProgress( int percent, const QString& message ) +void IndexTest::slotProgress( int percent, const TQString& message ) { qDebug("--- progress: %i: %s", percent, message.latin1()); } diff --git a/kmrml/kmrml/kcontrol/indextest.h b/kmrml/kmrml/kcontrol/indextest.h index 5f85f5f1..15cda2ce 100644 --- a/kmrml/kmrml/kcontrol/indextest.h +++ b/kmrml/kmrml/kcontrol/indextest.h @@ -18,7 +18,7 @@ public: private slots: void slotFinished( bool success ); - void slotProgress( int percent, const QString& message ); + void slotProgress( int percent, const TQString& message ); }; diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index 43e46b03..d2b60fc0 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <kaboutdata.h> #include <kapplication.h> @@ -40,10 +40,10 @@ using namespace KMrmlConfig; static const int COL_FILENAME = 1; -typedef KGenericFactory<KCMKMrml, QWidget> MrmlFactory; +typedef KGenericFactory<KCMKMrml, TQWidget> MrmlFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") ) -KCMKMrml::KCMKMrml(QWidget *parent, const char *name, const QStringList & ): +KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ): KCModule(MrmlFactory::instance(), parent, name) { KAboutData* ab = new KAboutData( @@ -58,13 +58,13 @@ KCMKMrml::KCMKMrml(QWidget *parent, const char *name, const QStringList & ): ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" ); setAboutData( ab ); - QVBoxLayout *layout = new QVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); layout->setSpacing( KDialog::spacingHint() ); m_mainPage = new MainPage( this, "main page" ); layout->addWidget( m_mainPage ); - connect( m_mainPage, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ))); + connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ))); checkGiftInstallation(); } @@ -75,26 +75,26 @@ KCMKMrml::~KCMKMrml() void KCMKMrml::checkGiftInstallation() { - QString giftExe = KGlobal::dirs()->findExe( "gift" ); - QString giftAddCollectionExe = KGlobal::dirs()->findExe( "gift-add-collection.pl" ); + TQString giftExe = KGlobal::dirs()->findExe( "gift" ); + TQString giftAddCollectionExe = KGlobal::dirs()->findExe( "gift-add-collection.pl" ); if ( giftExe.isEmpty() || giftAddCollectionExe.isEmpty() ) { - QString errorMessage = + TQString errorMessage = i18n("Cannot find executables \"gift\" and/or \"gift-add-collection.pl\" in the PATH.\n" "Please install the \"GNU Image Finding Tool\"."); KMessageBox::error( this, errorMessage ); m_mainPage->hide(); - QLabel *errorLabel = new QLabel( errorMessage, this ); - errorLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ) ); - KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", QString::null, this ); - urlLabel->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); - connect( urlLabel, SIGNAL( leftClickedURL( const QString& )), kapp, SLOT( invokeBrowser( const QString& )) ); - QLayout *l = layout(); - l->addItem( new QSpacerItem( 0, 10, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); + TQLabel *errorLabel = new TQLabel( errorMessage, this ); + errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString::null, this ); + urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) ); + TQLayout *l = layout(); + l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); l->add( errorLabel ); l->add( urlLabel ); - l->addItem( new QSpacerItem( 0, 10, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); + l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); errorLabel->show(); } else @@ -128,7 +128,7 @@ void KCMKMrml::save() emit changed( false ); } -QString KCMKMrml::quickHelp() const +TQString KCMKMrml::quickHelp() const { return i18n("<h1>Image Index</h1>" "KDE can make use of the GNU Image Finding Tool (GIFT) to " diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h index b0bb2443..306e55f0 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.h +++ b/kmrml/kmrml/kcontrol/kcmkmrml.h @@ -33,13 +33,13 @@ namespace KMrmlConfig Q_OBJECT public: - KCMKMrml(QWidget *parent, const char *name, const QStringList &); + KCMKMrml(TQWidget *parent, const char *name, const TQStringList &); virtual ~KCMKMrml(); virtual void defaults(); virtual void load(); virtual void save(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; private: void checkGiftInstallation(); diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index 514b9cf6..c4e65ac3 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -16,12 +16,12 @@ Boston, MA 02110-1301, USA. */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qtooltip.h> -#include <qwidget.h> -#include <qvgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqsizepolicy.h> +#include <tqtooltip.h> +#include <tqwidget.h> +#include <tqvgroupbox.h> #include <kcombobox.h> #include <kdialog.h> @@ -50,8 +50,8 @@ using namespace KMrmlConfig; -MainPage::MainPage( QWidget *parent, const char *name ) - : QVBox( parent, name ), +MainPage::MainPage( TQWidget *parent, const char *name ) + : TQVBox( parent, name ), m_indexer( 0L ), m_indexCleaner( 0L ), m_progressDialog( 0L ), @@ -61,12 +61,12 @@ MainPage::MainPage( QWidget *parent, const char *name ) m_config = new KMrml::Config(); setSpacing( KDialog::spacingHint() ); - QVGroupBox *gBox = new QVGroupBox( i18n("Indexing Server Configuration"), + TQVGroupBox *gBox = new TQVGroupBox( i18n("Indexing Server Configuration"), this ); m_serverWidget = new ServerConfigWidget( gBox, "server config widget" ); - QString tip = i18n("Hostname of the Indexing Server"); - QToolTip::add( m_serverWidget->m_hostLabel, tip ); - QToolTip::add( m_serverWidget->m_hostCombo, tip ); + TQString tip = i18n("Hostname of the Indexing Server"); + TQToolTip::add( m_serverWidget->m_hostLabel, tip ); + TQToolTip::add( m_serverWidget->m_hostCombo, tip ); m_serverWidget->m_portInput->setRange( 0, MAX_PORT_VALUE ); @@ -74,8 +74,8 @@ MainPage::MainPage( QWidget *parent, const char *name ) KURLRequester *requester = new KURLRequester( this, "dir requester" ); requester->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); requester->setURL( KGlobalSettings::documentPath() ); - connect( requester, SIGNAL( openFileDialog( KURLRequester * )), - SLOT( slotRequesterClicked( KURLRequester * ))); + connect( requester, TQT_SIGNAL( openFileDialog( KURLRequester * )), + TQT_SLOT( slotRequesterClicked( KURLRequester * ))); m_listBox = new KEditListBox( i18n("Folders to Be Indexed" ), requester->customEditor(), this, "listbox", @@ -87,30 +87,30 @@ MainPage::MainPage( QWidget *parent, const char *name ) KEditListBox::Add | KEditListBox::Remove ); #endif - connect( m_listBox, SIGNAL( changed() ), SLOT( slotDirectoriesChanged() )); - connect( m_serverWidget->m_hostCombo, SIGNAL( textChanged(const QString&)), - SLOT( slotHostChanged() )); - connect( m_serverWidget->m_portInput, SIGNAL( valueChanged( int )), - SLOT( slotPortChanged( int ) )); - connect ( m_serverWidget->m_useAuth, SIGNAL( toggled(bool) ), - SLOT( slotUseAuthChanged( bool ) )); - connect( m_serverWidget->m_userEdit, SIGNAL( textChanged( const QString&)), - SLOT( slotUserChanged( const QString& ) )); - connect( m_serverWidget->m_passEdit, SIGNAL( textChanged( const QString&)), - SLOT( slotPassChanged( const QString& ) )); - - connect( m_serverWidget->m_addButton, SIGNAL( clicked() ), - SLOT( slotAddClicked() )); - connect( m_serverWidget->m_removeButton, SIGNAL( clicked() ), - SLOT( slotRemoveClicked() )); - - connect( m_serverWidget->m_hostCombo, SIGNAL( activated( const QString& )), - SLOT( slotHostActivated( const QString& ))); - connect( m_serverWidget->m_hostCombo, SIGNAL( returnPressed() ), - SLOT( slotAddClicked() )); - - connect( m_serverWidget->m_autoPort, SIGNAL( toggled( bool ) ), - SLOT( slotAutoPortChanged( bool ) )); + connect( m_listBox, TQT_SIGNAL( changed() ), TQT_SLOT( slotDirectoriesChanged() )); + connect( m_serverWidget->m_hostCombo, TQT_SIGNAL( textChanged(const TQString&)), + TQT_SLOT( slotHostChanged() )); + connect( m_serverWidget->m_portInput, TQT_SIGNAL( valueChanged( int )), + TQT_SLOT( slotPortChanged( int ) )); + connect ( m_serverWidget->m_useAuth, TQT_SIGNAL( toggled(bool) ), + TQT_SLOT( slotUseAuthChanged( bool ) )); + connect( m_serverWidget->m_userEdit, TQT_SIGNAL( textChanged( const TQString&)), + TQT_SLOT( slotUserChanged( const TQString& ) )); + connect( m_serverWidget->m_passEdit, TQT_SIGNAL( textChanged( const TQString&)), + TQT_SLOT( slotPassChanged( const TQString& ) )); + + connect( m_serverWidget->m_addButton, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotAddClicked() )); + connect( m_serverWidget->m_removeButton, TQT_SIGNAL( clicked() ), + TQT_SLOT( slotRemoveClicked() )); + + connect( m_serverWidget->m_hostCombo, TQT_SIGNAL( activated( const TQString& )), + TQT_SLOT( slotHostActivated( const TQString& ))); + connect( m_serverWidget->m_hostCombo, TQT_SIGNAL( returnPressed() ), + TQT_SLOT( slotAddClicked() )); + + connect( m_serverWidget->m_autoPort, TQT_SIGNAL( toggled( bool ) ), + TQT_SLOT( slotAutoPortChanged( bool ) )); m_serverWidget->m_hostCombo->setTrapReturnKey( true ); m_serverWidget->m_hostCombo->setFocus(); @@ -162,9 +162,9 @@ void MainPage::save() m_config->addSettings( m_settings ); m_config->setDefaultHost( m_settings.host ); - QStringList indexDirs = m_listBox->items(); - QStringList oldIndexDirs = m_config->indexableDirectories(); - QStringList removedDirs = difference( oldIndexDirs, indexDirs ); + TQStringList indexDirs = m_listBox->items(); + TQStringList oldIndexDirs = m_config->indexableDirectories(); + TQStringList removedDirs = difference( oldIndexDirs, indexDirs ); m_config->setIndexableDirectories( indexDirs ); if ( indexDirs.isEmpty() ) @@ -181,14 +181,14 @@ void MainPage::save() processIndexDirs( removedDirs ); } -QStringList MainPage::difference( const QStringList& oldIndexDirs, - const QStringList& newIndexDirs ) const +TQStringList MainPage::difference( const TQStringList& oldIndexDirs, + const TQStringList& newIndexDirs ) const { - QStringList result; + TQStringList result; - QString slash = QString::fromLatin1("/"); - QStringList::ConstIterator oldIt = oldIndexDirs.begin(); - QString oldDir, newDir; + TQString slash = TQString::fromLatin1("/"); + TQStringList::ConstIterator oldIt = oldIndexDirs.begin(); + TQString oldDir, newDir; for ( ; oldIt != oldIndexDirs.end(); oldIt++ ) { @@ -198,7 +198,7 @@ QStringList MainPage::difference( const QStringList& oldIndexDirs, while ( oldDir.endsWith( slash ) ) // remove slashes oldDir.remove( oldDir.length() - 1, 1 ); - QStringList::ConstIterator newIt = newIndexDirs.begin(); + TQStringList::ConstIterator newIt = newIndexDirs.begin(); for ( ; newIt != newIndexDirs.end(); newIt++ ) { newDir = *newIt; @@ -234,7 +234,7 @@ void MainPage::initFromSettings( const KMrml::ServerSettings& settings ) m_locked = false; } -void MainPage::slotHostActivated( const QString& host ) +void MainPage::slotHostActivated( const TQString& host ) { // implicitly save the current settings when another host was chosen m_config->addSettings( m_settings ); @@ -244,7 +244,7 @@ void MainPage::slotHostActivated( const QString& host ) void MainPage::slotHostChanged() { - QString host = m_serverWidget->m_hostCombo->currentText(); + TQString host = m_serverWidget->m_hostCombo->currentText(); m_listBox->setEnabled( (host == "localhost") ); KMrml::ServerSettings settings = m_config->settingsForHost( host ); @@ -264,7 +264,7 @@ void MainPage::slotUseAuthChanged( bool enable ) changed(); } -void MainPage::slotUserChanged( const QString& user ) +void MainPage::slotUserChanged( const TQString& user ) { if ( m_locked ) return; @@ -273,7 +273,7 @@ void MainPage::slotUserChanged( const QString& user ) changed(); } -void MainPage::slotPassChanged( const QString& pass ) +void MainPage::slotPassChanged( const TQString& pass ) { if ( m_locked ) return; @@ -314,7 +314,7 @@ void MainPage::slotRequesterClicked( KURLRequester *requester ) void MainPage::slotAddClicked() { - QString host = m_serverWidget->m_hostCombo->currentText(); + TQString host = m_serverWidget->m_hostCombo->currentText(); m_settings.host = host; m_config->addSettings( m_settings ); @@ -326,7 +326,7 @@ void MainPage::slotAddClicked() void MainPage::slotRemoveClicked() { - QString host = m_serverWidget->m_hostCombo->currentText(); + TQString host = m_serverWidget->m_hostCombo->currentText(); if ( host.isEmpty() ) // should never happen return; @@ -340,7 +340,7 @@ void MainPage::slotRemoveClicked() void MainPage::enableWidgetsFor( const KMrml::ServerSettings& settings ) { - QString host = settings.host; + TQString host = settings.host; bool enableWidgets = (m_config->hosts().findIndex( host ) > -1); m_serverWidget->m_addButton->setEnabled(!enableWidgets && !host.isEmpty()); m_serverWidget->m_removeButton->setEnabled( enableWidgets && @@ -370,7 +370,7 @@ void MainPage::slotDirectoriesChanged() changed(); } -void MainPage::processIndexDirs( const QStringList& removeDirs ) +void MainPage::processIndexDirs( const TQStringList& removeDirs ) { // ### how to remove indexed directories? if ( !m_performIndexing || @@ -389,8 +389,8 @@ void MainPage::processIndexDirs( const QStringList& removeDirs ) true ); m_progressDialog->setAutoClose( false ); m_progressDialog->setMinimumWidth( 300 ); - connect( m_progressDialog, SIGNAL( cancelClicked() ), - SLOT( slotCancelIndexing() )); + connect( m_progressDialog, TQT_SIGNAL( cancelClicked() ), + TQT_SLOT( slotCancelIndexing() )); // argh -- don't automatically show the dialog m_progressDialog->setMinimumDuration( INT_MAX ); @@ -398,10 +398,10 @@ void MainPage::processIndexDirs( const QStringList& removeDirs ) if ( !removeDirs.isEmpty() ) { m_indexCleaner = new IndexCleaner( removeDirs, m_config, this ); - connect( m_indexCleaner, SIGNAL( advance( int ) ), - m_progressDialog->progressBar(), SLOT( advance( int ) )); - connect( m_indexCleaner, SIGNAL( finished() ), - SLOT( slotMaybeIndex() ) ); + connect( m_indexCleaner, TQT_SIGNAL( advance( int ) ), + m_progressDialog->progressBar(), TQT_SLOT( advance( int ) )); + connect( m_indexCleaner, TQT_SIGNAL( finished() ), + TQT_SLOT( slotMaybeIndex() ) ); m_indexCleaner->start(); } else @@ -438,15 +438,15 @@ void MainPage::slotMaybeIndex() // do the indexing m_indexer = new Indexer( m_config, this, "Indexer" ); - connect( m_indexer, SIGNAL( progress( int, const QString& )), - SLOT( slotIndexingProgress( int, const QString& ) )); - connect( m_indexer, SIGNAL( finished( int )), - SLOT( slotIndexingFinished( int ) )); + connect( m_indexer, TQT_SIGNAL( progress( int, const TQString& )), + TQT_SLOT( slotIndexingProgress( int, const TQString& ) )); + connect( m_indexer, TQT_SIGNAL( finished( int )), + TQT_SLOT( slotIndexingFinished( int ) )); m_indexer->startIndexing( m_config->indexableDirectories() ); } -void MainPage::slotIndexingProgress( int percent, const QString& message ) +void MainPage::slotIndexingProgress( int percent, const TQString& message ) { m_progressDialog->progressBar()->setValue( percent ); m_progressDialog->setLabel( message ); @@ -456,14 +456,14 @@ void MainPage::slotIndexingFinished( int returnCode ) { if ( returnCode != 0 ) { - QString syserr; + TQString syserr; if ( returnCode == 127 ) syserr = i18n("Is the \"GNU Image Finding Tool\" properly installed?"); else { char *err = strerror( returnCode ); if ( err ) - syserr = QString::fromLocal8Bit( err ); + syserr = TQString::fromLocal8Bit( err ); else syserr = i18n("Unknown error: %1").arg( returnCode ); } diff --git a/kmrml/kmrml/kcontrol/mainpage.h b/kmrml/kmrml/kcontrol/mainpage.h index e91b4168..8000aea9 100644 --- a/kmrml/kmrml/kcontrol/mainpage.h +++ b/kmrml/kmrml/kcontrol/mainpage.h @@ -19,11 +19,11 @@ #ifndef MAINPAGE_H #define MAINPAGE_H -#include <qvbox.h> +#include <tqvbox.h> #include <kmrml_config.h> -class QCheckBox; +class TQCheckBox; class KComboBox; class KEditListBox; class KIntNumInput; @@ -48,7 +48,7 @@ namespace KMrmlConfig Q_OBJECT public: - MainPage( QWidget *parent, const char *name ); + MainPage( TQWidget *parent, const char *name ); ~MainPage(); void resetDefaults(); @@ -63,20 +63,20 @@ namespace KMrmlConfig void slotRequesterClicked( KURLRequester * ); void slotHostChanged(); void slotUseAuthChanged( bool ); - void slotUserChanged( const QString& ); - void slotPassChanged( const QString& ); + void slotUserChanged( const TQString& ); + void slotPassChanged( const TQString& ); void slotPortChanged( int ); void slotAutoPortChanged( bool ); void slotAddClicked(); void slotRemoveClicked(); - void slotHostActivated( const QString& ); + void slotHostActivated( const TQString& ); void slotDirectoriesChanged(); void slotMaybeIndex(); - void slotIndexingProgress( int percent, const QString& message ); + void slotIndexingProgress( int percent, const TQString& message ); void slotIndexingFinished( int returnCode ); void slotCancelIndexing(); @@ -85,10 +85,10 @@ namespace KMrmlConfig void enableWidgetsFor( const KMrml::ServerSettings& settings ); void initFromSettings( const KMrml::ServerSettings& settings ); - void processIndexDirs( const QStringList& removedDirs ); + void processIndexDirs( const TQStringList& removedDirs ); - QStringList difference( const QStringList& oldIndexDirs, - const QStringList& newIndexDirs ) const; + TQStringList difference( const TQStringList& oldIndexDirs, + const TQStringList& newIndexDirs ) const; ServerConfigWidget *m_serverWidget; KEditListBox *m_listBox; |