diff options
Diffstat (limited to 'libtdepim/kimportdialog.cpp')
| -rw-r--r-- | libtdepim/kimportdialog.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index 879b6156..19468ff9 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -43,8 +43,8 @@ #include <klineedit.h> #include <tdelocale.h> #include <kprogress.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <tdefiledialog.h> @@ -164,15 +164,15 @@ KImportDialog::KImportDialog(TQWidget* parent) new TQLabel(i18n("File to import:"),fileBox); KURLRequester *urlRequester = new KURLRequester(fileBox); urlRequester->setFilter( "*.csv" ); - connect(urlRequester,TQT_SIGNAL(returnPressed(const TQString &)), - TQT_SLOT(setFile(const TQString &))); - connect(urlRequester,TQT_SIGNAL(urlSelected(const TQString &)), - TQT_SLOT(setFile(const TQString &))); - connect(urlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), - TQT_SLOT(slotUrlChanged(const TQString & ))); + connect(urlRequester,TQ_SIGNAL(returnPressed(const TQString &)), + TQ_SLOT(setFile(const TQString &))); + connect(urlRequester,TQ_SIGNAL(urlSelected(const TQString &)), + TQ_SLOT(setFile(const TQString &))); + connect(urlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), + TQ_SLOT(slotUrlChanged(const TQString & ))); mTable = new TQTable(5,5,topBox); mTable->setMinimumHeight( 150 ); - connect(mTable,TQT_SIGNAL(selectionChanged()),TQT_SLOT(tableSelected())); + connect(mTable,TQ_SIGNAL(selectionChanged()),TQ_SLOT(tableSelected())); TQHBox *separatorBox = new TQHBox( topBox ); separatorBox->setSpacing( spacingHint() ); @@ -185,8 +185,8 @@ KImportDialog::KImportDialog(TQWidget* parent) mSeparatorCombo->insertItem( i18n( "Space" ) ); mSeparatorCombo->insertItem( "=" ); mSeparatorCombo->insertItem( ";" ); - connect(mSeparatorCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( separatorClicked(int) ) ); + connect(mSeparatorCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( separatorClicked(int) ) ); mSeparatorCombo->setCurrentItem( 0 ); TQHBox *rowsBox = new TQHBox( topBox ); @@ -208,34 +208,34 @@ KImportDialog::KImportDialog(TQWidget* parent) mHeaderList = new TQListView(listsBox); mHeaderList->addColumn(i18n("Header")); - connect(mHeaderList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(headerSelected(TQListViewItem*))); - connect(mHeaderList,TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(assignColumn(TQListViewItem *))); + connect(mHeaderList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(headerSelected(TQListViewItem*))); + connect(mHeaderList,TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(assignColumn(TQListViewItem *))); mFormatCombo = new KComboBox( listsBox ); mFormatCombo->setDuplicatesEnabled( false ); TQPushButton *assignButton = new TQPushButton(i18n("Assign to Selected Column"), assignBox); - connect(assignButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignColumn())); + connect(assignButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignColumn())); TQPushButton *removeButton = new TQPushButton(i18n("Remove Assignment From Selected Column"), assignBox); - connect(removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeColumn())); + connect(removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeColumn())); TQPushButton *assignTemplateButton = new TQPushButton(i18n("Assign with Template..."), assignBox); - connect(assignTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignTemplate())); + connect(assignTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignTemplate())); TQPushButton *saveTemplateButton = new TQPushButton(i18n("Save Current Template"), assignBox); - connect(saveTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(saveTemplate())); + connect(saveTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(saveTemplate())); resize(500,300); - connect(this,TQT_SIGNAL(okClicked()),TQT_SLOT(applyConverter())); - connect(this,TQT_SIGNAL(applyClicked()),TQT_SLOT(applyConverter())); + connect(this,TQ_SIGNAL(okClicked()),TQ_SLOT(applyConverter())); + connect(this,TQ_SIGNAL(applyClicked()),TQ_SLOT(applyConverter())); enableButtonOK(!urlRequester->lineEdit()->text().isEmpty()); } @@ -338,7 +338,7 @@ void KImportDialog::readFile( int rows ) { progress->setValue(progressValue++); if (progressValue % 15 == 0) // try not to constantly repaint - kapp->processEvents(); + tdeApp->processEvents(); } if (x == '\r') inputStream >> x; // eat '\r', to handle DOS/LOSEDOWS files correctly @@ -572,12 +572,12 @@ void KImportDialog::assignTemplate() TQStringList templates; // load all template files - TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + + TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( tdeApp->name() ) + "/csv-templates/*.desktop", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( !config.hasGroup( "csv column map" ) ) continue; @@ -597,7 +597,7 @@ void KImportDialog::assignTemplate() if ( !ok ) return; - KSimpleConfig config( fileMap[ tmp ], true ); + TDESimpleConfig config( fileMap[ tmp ], true ); config.setGroup( "General" ); uint numColumns = config.readUnsignedNumEntry( "Columns" ); int format = config.readNumEntry( "Format" ); @@ -666,7 +666,7 @@ void KImportDialog::applyConverter() mCurrentRow = i; progress->setValue(i); if (i % 5 == 0) // try to avoid constantly processing events - kapp->processEvents(); + tdeApp->processEvents(); convertRow(); } @@ -728,7 +728,7 @@ TQString KImportDialog::data( uint row, uint col ) void KImportDialog::saveTemplate() { TQString fileName = KFileDialog::getSaveFileName( - locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ), + locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ), "*.desktop", this ); if ( fileName.isEmpty() ) |