diff options
Diffstat (limited to 'kaddressbook/xxport')
25 files changed, 132 insertions, 130 deletions
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp index 2cfdf98ca..0b7c3dc7c 100644 --- a/kaddressbook/xxport/bookmark_xxport.cpp +++ b/kaddressbook/xxport/bookmark_xxport.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kbookmark.h> @@ -33,8 +33,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_bookmark_xxport, BookmarkXXPort ) -BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createExportAction( i18n( "Export Bookmarks Menu..." ) ); } diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h index f12ed8e28..09d95f910 100644 --- a/kaddressbook/xxport/bookmark_xxport.h +++ b/kaddressbook/xxport/bookmark_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BOOKMARK_XXPORT_H @@ -30,9 +30,10 @@ class BookmarkXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "bookmark"; } diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index 52286d3b7..5fdc89a5c 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -36,8 +36,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_csv_xxport, CSVXXPort ) -CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import CSV List..." ) ); createExportAction( i18n( "Export CSV List..." ) ); diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h index b957299d4..a55f326b5 100644 --- a/kaddressbook/xxport/csv_xxport.h +++ b/kaddressbook/xxport/csv_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CSV_XXPORT_H @@ -29,9 +29,10 @@ class CSVXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "csv"; } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 36f760540..4356a5997 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -50,10 +50,10 @@ enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 }; -CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, +CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent, const char * name ) : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 | - User2, Ok, parent, name, true, true ), + User2, Ok, tqparent, name, true, true ), mAdjustRows( false ), mStartLine( 0 ), mTextQuote( '"' ), @@ -383,11 +383,11 @@ void CSVImportDialog::initGUI() // Delimiter: comma, semicolon, tab, space, other mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage ); - mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); + mDelimiterBox->setColumnLayout( 0, TQt::Vertical ); mDelimiterBox->tqlayout()->setSpacing( spacingHint() ); mDelimiterBox->tqlayout()->setMargin( marginHint() ); TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() ); - delimiterLayout->tqsetAlignment( Qt::AlignTop ); + delimiterLayout->tqsetAlignment( TQt::AlignTop ); tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox ); @@ -465,7 +465,7 @@ void CSVImportDialog::fillTable() int row, column; bool lastCharDelimiter = false; bool ignoreDups = mIgnoreDuplicates->isChecked(); - enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, + enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD, S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; TQChar x; @@ -517,7 +517,7 @@ void CSVImportDialog::fillTable() switch ( state ) { case S_START : if ( x == mTextQuote ) { - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } else if ( x == mDelimiter ) { if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) ) ++column; @@ -530,9 +530,9 @@ void CSVImportDialog::fillTable() state = S_MAYBE_NORMAL_FIELD; } break; - case S_QUOTED_FIELD : + case S_TQUOTED_FIELD : if ( x == mTextQuote ) { - state = S_MAYBE_END_OF_QUOTED_FIELD; + state = S_MAYBE_END_OF_TQUOTED_FIELD; } else if ( x == '\n' && mTextQuote.isNull() ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -549,10 +549,10 @@ void CSVImportDialog::fillTable() field += x; } break; - case S_MAYBE_END_OF_QUOTED_FIELD : + case S_MAYBE_END_OF_TQUOTED_FIELD : if ( x == mTextQuote ) { field += x; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } else if ( x == mDelimiter || x == '\n' ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -566,10 +566,10 @@ void CSVImportDialog::fillTable() } state = S_START; } else { - state = S_END_OF_QUOTED_FIELD; + state = S_END_OF_TQUOTED_FIELD; } break; - case S_END_OF_QUOTED_FIELD : + case S_END_OF_TQUOTED_FIELD : if ( x == mDelimiter || x == '\n' ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -583,13 +583,13 @@ void CSVImportDialog::fillTable() } state = S_START; } else { - state = S_END_OF_QUOTED_FIELD; + state = S_END_OF_TQUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if ( x == mTextQuote ) { field = ""; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; break; } case S_NORMAL_FIELD : @@ -707,11 +707,11 @@ void CSVImportDialog::resizeColumns() TQMap<TQString, uint>::ConstIterator it; for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) { - width = QMAX( width, fm.width( it.key() ) ); + width = TQMAX( width, fm.width( it.key() ) ); } for ( int i = 0; i < mTable->numCols(); ++i ) - mTable->setColumnWidth( i, QMAX( width + 15, mTable->columnWidth( i ) ) ); + mTable->setColumnWidth( i, TQMAX( width + 15, mTable->columnWidth( i ) ) ); } void CSVImportDialog::returnPressed() diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h index baa538e03..f3c953ba5 100644 --- a/kaddressbook/xxport/csvimportdialog.h +++ b/kaddressbook/xxport/csvimportdialog.h @@ -41,9 +41,10 @@ class TQTable; class CSVImportDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, + CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~CSVImportDialog(); diff --git a/kaddressbook/xxport/dateparser.cpp b/kaddressbook/xxport/dateparser.cpp index 2052407a6..387d731a1 100644 --- a/kaddressbook/xxport/dateparser.cpp +++ b/kaddressbook/xxport/dateparser.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqdatetime.h> diff --git a/kaddressbook/xxport/dateparser.h b/kaddressbook/xxport/dateparser.h index 569969515..14fe14473 100644 --- a/kaddressbook/xxport/dateparser.h +++ b/kaddressbook/xxport/dateparser.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DATEPARSER_H @@ -29,7 +29,7 @@ /** This class parses the date out of a given string with the help of a pattern. - The pattern can tqcontains the following key characters: + The pattern can contains the following key characters: y = year (e.g. 82) Y = year (e.g. 1982) m = month (e.g. 7, 07 or 12) diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp index d31cd1115..ca804fe30 100644 --- a/kaddressbook/xxport/eudora_xxport.cpp +++ b/kaddressbook/xxport/eudora_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -38,8 +38,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_eudora_xxport, EudoraXXPort ) -EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import Eudora Addressbook..." ) ); } @@ -124,22 +124,22 @@ TQString EudoraXXPort::key( const TQString& line) const { int e; TQString result; - int b = line.find( '\"', 0 ); + int b = line.tqfind( '\"', 0 ); if ( b == -1 ) { - b = line.find( ' ' ); + b = line.tqfind( ' ' ); if ( b == -1 ) return result; b++; - e = line.find( ' ', b ); + e = line.tqfind( ' ', b ); result = line.mid( b, e - b ); return result; } b++; - e = line.find( '\"', b ); + e = line.tqfind( '\"', b ); if ( e == -1 ) return result; @@ -191,14 +191,14 @@ TQString EudoraXXPort::get( const TQString& line, const TQString& key ) const uint i; // Find formatted key, return on error - b = line.find( fd ); + b = line.tqfind( fd ); if ( b == -1 ) - return TQString::null; + return TQString(); b += fd.length(); - e = line.find( '>', b ); + e = line.tqfind( '>', b ); if ( e == -1 ) - return TQString::null; + return TQString(); e--; TQString result = line.mid( b, e - b + 1 ); diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h index 0181aa318..e8dcf939a 100644 --- a/kaddressbook/xxport/eudora_xxport.h +++ b/kaddressbook/xxport/eudora_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef EUDORA_XXPORT_H @@ -29,9 +29,10 @@ class EudoraXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "eudora"; } @@ -43,7 +44,7 @@ class EudoraXXPort : public KAB::XXPort TQString comment( const TQString& line ) const; TQString email( const TQString& line ) const; TQString key( const TQString& line ) const; - int find( const TQString& key ) const; + int tqfind( const TQString& key ) const; }; #endif diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index faf527073..343831a90 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ /* Description: @@ -77,8 +77,8 @@ static KProgressDialog *m_progressDlg; K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_gnokii_xxport, GNOKIIXXPort ) -GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { this_filter = this; m_progressDlg = NULL; @@ -94,7 +94,7 @@ static TQString makeValidPhone( const TQString &number ) TQString num = number.simplifyWhiteSpace(); TQString allowed("0123456789*+#pw"); for (unsigned int i=num.length(); i>=1; i--) - if (allowed.find(num[i-1])==-1) + if (allowed.tqfind(num[i-1])==-1) num.remove(i-1,1); if (num.isEmpty()) num = "0"; @@ -154,7 +154,7 @@ static TQString businit(void) GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") .arg(manufacturer, model, revision, imei) ); - return TQString::null; + return TQString(); } @@ -242,7 +242,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // try to split Name into FamilyName and GivenName s = GN_FROM(name).simplifyWhiteSpace(); a->setFormattedName(s); // set formatted name as in Phone - if (s.find(',') == -1) { + if (s.tqfind(',') == -1) { // assumed format: "givenname [... familyname]" addrlist = TQStringList::split(' ', s); if (addrlist.count() == 1) { @@ -548,9 +548,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->show(); processEvents(); -#if (QT_VERSION >= 0x030300) - m_progressDlg->setCursor( Qt::BusyCursor ); -#endif + m_progressDlg->setCursor( TQt::BusyCursor ); TQString errStr = businit(); m_progressDlg->unsetCursor(); @@ -605,9 +603,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri gn_error error; bool deleteLabelInitialized = false; -#if (QT_VERSION >= 0x030300) - m_progressDlg->setCursor( Qt::BusyCursor ); -#endif + m_progressDlg->setCursor( TQt::BusyCursor ); TQString errStr = businit(); m_progressDlg->unsetCursor(); @@ -645,7 +641,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri i18n("<qt>Do you want the selected contacts to be <b>appended</b> to " "the current mobile phonebook or should they <b>tqreplace</b> all " "currently existing phonebook entries ?<br><br>" - "Please note, that in case you choose to tqreplace the phonebook " + "Please note, that in case you choose to replace the phonebook " "entries, every contact in your phone will be deleted and only " "the newly exported contacts will be available from inside your phone.</qt>"), i18n("Export to Mobile Phone"), @@ -805,7 +801,7 @@ static gn_data data; static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_device_unlock(lockfile); + if (lockfile) gn_tqdevice_unlock(lockfile); } static TQString businit(void) @@ -834,7 +830,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_device_lock(state.config.port_device); + lockfile = gn_tqdevice_lock(state.config.port_tqdevice); if (lockfile == NULL) { return i18n("Gnokii reports a 'Lock File Error'.\n " "Please exit all other running instances of gnokii, check if you have " @@ -872,7 +868,7 @@ static TQString businit(void) qstrncpy(imei, unknown, sizeof(imei)-1); if (m_progressDlg->wasCancelled()) - return TQString::null; + return TQString(); else error = gn_sm_functions(GN_OP_Identify, &data, &state); GNOKII_CHECK_ERROR(error); @@ -882,7 +878,7 @@ static TQString businit(void) PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); - return TQString::null; + return TQString(); } @@ -895,7 +891,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat memset(memstat, 0, sizeof(*memstat)); memstat->memory_type = memtype; data.memory_status = memstat; - error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state); + error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state); GNOKII_CHECK_ERROR(error); if (error != GN_ERR_NONE) { switch (memtype) { @@ -1019,7 +1015,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // try to split Name into FamilyName and GivenName s = GN_FROM(entry.name).simplifyWhiteSpace(); a->setFormattedName(s); // set formatted name as in Phone - if (s.find(',') == -1) { + if (s.tqfind(',') == -1) { // assumed format: "givenname [... familyname]" addrlist = TQStringList::split(' ', s); if (addrlist.count() == 1) { @@ -1343,9 +1339,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->show(); processEvents(); -#if (QT_VERSION >= 0x030300) - m_progressDlg->setCursor( Qt::BusyCursor ); -#endif + m_progressDlg->setCursor( TQt::BusyCursor ); TQString errStr = businit(); m_progressDlg->unsetCursor(); @@ -1400,9 +1394,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri gn_error error; bool deleteLabelInitialized = false; -#if (QT_VERSION >= 0x030300) - m_progressDlg->setCursor( Qt::BusyCursor ); -#endif + m_progressDlg->setCursor( TQt::BusyCursor ); TQString errStr = businit(); m_progressDlg->unsetCursor(); @@ -1440,7 +1432,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri i18n("<qt>Do you want the selected contacts to be <b>appended</b> to " "the current mobile phonebook or should they <b>tqreplace</b> all " "currently existing phonebook entries ?<br><br>" - "Please note, that in case you choose to tqreplace the phonebook " + "Please note, that in case you choose to replace the phonebook " "entries, every contact in your phone will be deleted and only " "the newly exported contacts will be available from inside your phone.</qt>"), i18n("Export to Mobile Phone"), diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h index edee6abbe..a78ca2335 100644 --- a/kaddressbook/xxport/gnokii_xxport.h +++ b/kaddressbook/xxport/gnokii_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef GNOKII_XXPORT_H @@ -29,9 +29,10 @@ class GNOKIIXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "gnokii"; } diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index fb03e2c32..b0e44c3db 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -39,8 +39,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_kde2_xxport, KDE2XXPort ) -KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import KDE 2 Addressbook..." ) ); } diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h index a56bc0288..895a09a43 100644 --- a/kaddressbook/xxport/kde2_xxport.h +++ b/kaddressbook/xxport/kde2_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KDE2_XXPORT_H @@ -29,9 +29,10 @@ class KDE2XXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "kde2"; } diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index 799e4ca35..307fb6821 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ /* @@ -50,8 +50,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_ldif_xxport, LDIFXXPort ) -LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import LDIF Addressbook..." ) ); createExportAction( i18n( "Export LDIF Addressbook..." ) ); diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h index 72c047d64..2d1e9e04e 100644 --- a/kaddressbook/xxport/ldif_xxport.h +++ b/kaddressbook/xxport/ldif_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LDIF_XXPORT_H @@ -30,9 +30,10 @@ class LDIFXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "ldif"; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index c10a28523..9ddbcb396 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -38,8 +38,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_opera_xxport, OperaXXPort ) -OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import Opera Addressbook..." ) ); } @@ -84,7 +84,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const } if ( parseContact == true ) { - int sep = line.find( '=' ); + int sep = line.tqfind( '=' ); key = line.left( sep ).lower(); value = line.mid( sep + 1 ); if ( key == TQString::tqfromLatin1( "name" ) ) diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h index 7730dde56..b33c91521 100644 --- a/kaddressbook/xxport/opera_xxport.h +++ b/kaddressbook/xxport/opera_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef OPERA_XXPORT_H @@ -30,9 +30,10 @@ class OperaXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "opera"; } diff --git a/kaddressbook/xxport/pab_mapihd.cpp b/kaddressbook/xxport/pab_mapihd.cpp index 6d61cb339..b1ab4e5f4 100644 --- a/kaddressbook/xxport/pab_mapihd.cpp +++ b/kaddressbook/xxport/pab_mapihd.cpp @@ -151,7 +151,7 @@ pabrec_entry e=pr_unknown; return e; } -pabfields_t::pabfields_t(pabrec & R, TQWidget * /*parent*/) +pabfields_t::pabfields_t(pabrec & R, TQWidget * /*tqparent*/) { // Skip the first two words, because they're always the // same 000c 0014 ==> 0014 gives us the types, so we diff --git a/kaddressbook/xxport/pab_mapihd.h b/kaddressbook/xxport/pab_mapihd.h index c54be4500..7db97873a 100644 --- a/kaddressbook/xxport/pab_mapihd.h +++ b/kaddressbook/xxport/pab_mapihd.h @@ -105,7 +105,7 @@ word_t literal(int k); content_t order(int k); public: - pabfields_t(pabrec & R, TQWidget *parent); + pabfields_t(pabrec & R, TQWidget *tqparent); public: KABC::Addressee get( ); bool isOK(void) { return OK; } diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h index c26cbdf23..13f2b7200 100644 --- a/kaddressbook/xxport/pab_pablib.h +++ b/kaddressbook/xxport/pab_pablib.h @@ -36,7 +36,7 @@ class pab TQFile in; const char *pabfile; TQString cap; - TQWidget *parent; + TQWidget *tqparent; public: pab(const char *pabFile); ~pab(); diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 6aa818503..1b5b3c6f7 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -40,8 +40,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_pab_xxport, PABXXPort ) -PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n("Import MS Exchange Personal Address Book (.PAB)") ); } diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h index e98b56bfa..70eef1a3f 100644 --- a/kaddressbook/xxport/pab_xxport.h +++ b/kaddressbook/xxport/pab_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PAB_XXPORT_H @@ -30,9 +30,10 @@ class PABXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "pab"; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 69f854f33..e66016a14 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -56,7 +56,7 @@ class VCardViewerDialog : public KDialogBase { public: VCardViewerDialog( const KABC::Addressee::List &list, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); KABC::Addressee::List contacts() const; @@ -78,7 +78,7 @@ class VCardViewerDialog : public KDialogBase class VCardExportSelectionDialog : public KDialogBase { public: - VCardExportSelectionDialog( TQWidget *parent, const char *name = 0 ); + VCardExportSelectionDialog( TQWidget *tqparent, const char *name = 0 ); ~VCardExportSelectionDialog(); bool exportPrivateFields() const; @@ -93,8 +93,8 @@ class VCardExportSelectionDialog : public KDialogBase TQCheckBox *mEncryptionKeys; }; -VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import vCard..." ) ); createExportAction( i18n( "Export vCard 2.1..." ), "v21" ); @@ -131,7 +131,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS TQString msg = i18n( "You have selected a list of contacts, shall they be " "exported to several files?" ); - switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) { + switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString(), i18n("Export to Several Files"), i18n("Export to One File") ) ) { case KMessageBox::Yes: { KURL baseUrl = KFileDialog::getExistingURL(); if ( baseUrl.isEmpty() ) @@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const #endif } else { if ( XXPortManager::importURL.isEmpty() ) - urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", tqparentWidget(), + urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", tqparentWidget(), i18n( "Select vCard to Import" ) ); else urls.append( XXPortManager::importURL ); @@ -445,7 +445,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type ) context->setArmor( false ); context->setTextMode( false ); - QGpgME::QByteArrayDataProvider dataProvider; + QGpgME::TQByteArrayDataProvider dataProvider; GpgME::Data dataObj( &dataProvider ); GpgME::Error error = context->exportPublicKeys( fingerprint.latin1(), dataObj ); delete context; @@ -465,9 +465,9 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type ) // ---------- VCardViewer Dialog ---------------- // VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, - TQWidget *parent, const char *name ) + TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Import vCard" ), Yes | No | Apply | Cancel, Yes, - parent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ), + tqparent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ), mContacts( list ) { TQFrame *page = plainPage(); @@ -537,10 +537,10 @@ void VCardViewerDialog::slotCancel() // ---------- VCardExportSelection Dialog ---------------- // -VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent, +VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Select vCard Fields" ), Ok | Cancel, Ok, - parent, name, true, true ) + tqparent, name, true, true ) { TQFrame *page = plainPage(); diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h index 191d37a39..e051d53ff 100644 --- a/kaddressbook/xxport/vcard_xxport.h +++ b/kaddressbook/xxport/vcard_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef VCARD_XXPORT_H @@ -30,9 +30,10 @@ class VCardXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "vcard"; } |