diff options
Diffstat (limited to 'kexi/plugins/importexport')
5 files changed, 14 insertions, 14 deletions
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index f3347676..37e30e04 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, } if (copyToClipboard) - kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard); + kapp->clipboard()->setText(buffer, TQClipboard::Clipboard); delete [] isText; delete [] isDateTime; diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 94642d38..4a11d1d7 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -346,14 +346,14 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked() } } -void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout ) +void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout ) { - TQWizard::layOutButtonRow( tqlayout ); + TQWizard::layOutButtonRow( layout ); - //find the last subtqlayout + //find the last sublayout TQLayout *l = 0; - for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit) - l = lit.current()->tqlayout(); + for (TQLayoutIterator lit( layout->iterator() ); lit.current(); ++lit) + l = lit.current()->layout(); if (dynamic_cast<TQBoxLayout*>(l)) { if (!m_defaultsBtn) { m_defaultsBtn = new KPushButton(i18n("Defaults"), this); diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h index 27213159..7ef7020d 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h @@ -62,7 +62,7 @@ class KexiCSVExportWizard : public KWizard protected: //! reimplemented to add "Defaults" button on the left hand - virtual void layOutButtonRow( TQHBoxLayout * tqlayout ); + virtual void layOutButtonRow( TQHBoxLayout * layout ); //! \return default delimiter depending on mode. TQString defaultDelimiter() const; diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 69942a79..0e5f6e4c 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -280,7 +280,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, if ( m_mode == Clipboard ) { setCaption( i18n( "Inserting From Clipboard" ) ); - TQMimeSource * mime = TQApplication::tqclipboard()->data(); + TQMimeSource * mime = TQApplication::clipboard()->data(); if ( !mime ) { KMessageBox::information( this, i18n("There is no data in the clipboard.") ); @@ -336,11 +336,11 @@ if ( m_mode == Clipboard ) } else if (m_mode == Clipboard) { TQCString subtype("plain"); - m_clipboardData = TQApplication::tqclipboard()->text(subtype, TQClipboard::Clipboard); + m_clipboardData = TQApplication::clipboard()->text(subtype, TQClipboard::Clipboard); /* debug - for (int i=0;TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i);i++) + for (int i=0;TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i);i++) kdDebug() << i << ": " - << TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i) << endl; + << TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i) << endl; */ } else { @@ -705,9 +705,9 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i if (x == '\r') { continue; // eat '\r', to handle RFC-compliant files } - if (offset==0 && x.tqunicode()==0xfeff) { + if (offset==0 && x.unicode()==0xfeff) { // Ignore BOM, the "Byte Order Mark" - // (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.tqunicode.org/charts/PDF/UFFF0.pdf) + // (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf) // Probably fixed in TQt4. continue; } diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h index 3c420c7a..76f76d31 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.h +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h @@ -46,7 +46,7 @@ class KexiCSVInfoLabel : public TQWidget setFileName() can be used to display filename and setCommentAfterFileName() to display additional comment. - The widget's tqlayout can look like this: + The widget's layout can look like this: \pre [icon] [labeltext] [filename] [comment] */ |