summaryrefslogtreecommitdiffstats
path: root/kaddressbook/xxport
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook/xxport')
-rw-r--r--kaddressbook/xxport/bookmark_xxport.cpp2
-rw-r--r--kaddressbook/xxport/bookmark_xxport.h2
-rw-r--r--kaddressbook/xxport/csv_xxport.h2
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp70
-rw-r--r--kaddressbook/xxport/csvimportdialog.h2
-rw-r--r--kaddressbook/xxport/eudora_xxport.h2
-rw-r--r--kaddressbook/xxport/gnokii_xxport.h2
-rw-r--r--kaddressbook/xxport/kde2_xxport.cpp4
-rw-r--r--kaddressbook/xxport/kde2_xxport.h2
-rw-r--r--kaddressbook/xxport/ldif_xxport.h2
-rw-r--r--kaddressbook/xxport/opera_xxport.h2
-rw-r--r--kaddressbook/xxport/pab_xxport.cpp4
-rw-r--r--kaddressbook/xxport/pab_xxport.h2
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp19
-rw-r--r--kaddressbook/xxport/vcard_xxport.h2
15 files changed, 66 insertions, 53 deletions
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index f2249526..0ab1bba8 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -27,7 +27,7 @@
#include <kbookmarkmenu.h>
#include <kbookmarkdombuilder.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "bookmark_xxport.h"
diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h
index fde6fe4d..03fe7d0d 100644
--- a/kaddressbook/xxport/bookmark_xxport.h
+++ b/kaddressbook/xxport/bookmark_xxport.h
@@ -29,7 +29,7 @@
class BookmarkXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h
index f0a28fde..473507b6 100644
--- a/kaddressbook/xxport/csv_xxport.h
+++ b/kaddressbook/xxport/csv_xxport.h
@@ -28,7 +28,7 @@
class CSVXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 091d277f..4b0a1c9e 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -41,7 +41,7 @@
#include <kinputdialog.h>
#include <tdemessagebox.h>
#include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurlrequester.h>
#include "dateparser.h"
@@ -121,33 +121,33 @@ CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent,
reloadCodecs();
- connect( mDelimiterBox, TQT_SIGNAL( clicked( int ) ),
- this, TQT_SLOT( delimiterClicked( int ) ) );
- connect( mDelimiterEdit, TQT_SIGNAL( returnPressed() ),
- this, TQT_SLOT( returnPressed() ) );
- connect( mDelimiterEdit, TQT_SIGNAL( textChanged ( const TQString& ) ),
- this, TQT_SLOT( textChanged ( const TQString& ) ) );
- connect( mComboLine, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( lineSelected( const TQString& ) ) );
- connect( mComboQuote, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( textquoteSelected( const TQString& ) ) );
- connect( mIgnoreDuplicates, TQT_SIGNAL( stateChanged( int ) ),
- this, TQT_SLOT( ignoreDuplicatesChanged( int ) ) );
- connect( mCodecCombo, TQT_SIGNAL( activated( const TQString& ) ),
- this, TQT_SLOT( codecChanged() ) );
-
- connect( mUrlRequester, TQT_SIGNAL( returnPressed( const TQString& ) ),
- this, TQT_SLOT( setFile( const TQString& ) ) );
- connect( mUrlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ),
- this, TQT_SLOT( setFile( const TQString& ) ) );
- connect( mUrlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString& ) ),
- this, TQT_SLOT( urlChanged( const TQString& ) ) );
-
- connect( this, TQT_SIGNAL( user1Clicked() ),
- this, TQT_SLOT( applyTemplate() ) );
-
- connect( this, TQT_SIGNAL( user2Clicked() ),
- this, TQT_SLOT( saveTemplate() ) );
+ connect( mDelimiterBox, TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SLOT( delimiterClicked( int ) ) );
+ connect( mDelimiterEdit, TQ_SIGNAL( returnPressed() ),
+ this, TQ_SLOT( returnPressed() ) );
+ connect( mDelimiterEdit, TQ_SIGNAL( textChanged ( const TQString& ) ),
+ this, TQ_SLOT( textChanged ( const TQString& ) ) );
+ connect( mComboLine, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( lineSelected( const TQString& ) ) );
+ connect( mComboQuote, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( textquoteSelected( const TQString& ) ) );
+ connect( mIgnoreDuplicates, TQ_SIGNAL( stateChanged( int ) ),
+ this, TQ_SLOT( ignoreDuplicatesChanged( int ) ) );
+ connect( mCodecCombo, TQ_SIGNAL( activated( const TQString& ) ),
+ this, TQ_SLOT( codecChanged() ) );
+
+ connect( mUrlRequester, TQ_SIGNAL( returnPressed( const TQString& ) ),
+ this, TQ_SLOT( setFile( const TQString& ) ) );
+ connect( mUrlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ),
+ this, TQ_SLOT( setFile( const TQString& ) ) );
+ connect( mUrlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString& ) ),
+ this, TQ_SLOT( urlChanged( const TQString& ) ) );
+
+ connect( this, TQ_SIGNAL( user1Clicked() ),
+ this, TQ_SLOT( applyTemplate() ) );
+
+ connect( this, TQ_SIGNAL( user2Clicked() ),
+ this, TQ_SLOT( saveTemplate() ) );
}
CSVImportDialog::~CSVImportDialog()
@@ -166,7 +166,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const
progressDialog.setLabel( i18n( "Importing contacts" ) );
progressDialog.show();
- kapp->processEvents();
+ tdeApp->processEvents();
for ( int row = 1; row < mTable->numRows(); ++row ) {
TDEABC::Addressee a;
@@ -344,7 +344,7 @@ TDEABC::AddresseeList CSVImportDialog::contacts() const
}
}
- kapp->processEvents();
+ tdeApp->processEvents();
if ( progressDialog.wasCancelled() )
return TDEABC::AddresseeList();
@@ -383,7 +383,7 @@ 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->layout()->setSpacing( spacingHint() );
mDelimiterBox->layout()->setMargin( marginHint() );
TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() );
@@ -792,12 +792,12 @@ void CSVImportDialog::applyTemplate()
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;
@@ -817,7 +817,7 @@ void CSVImportDialog::applyTemplate()
if ( !ok )
return;
- KSimpleConfig config( fileMap[ tmp ], true );
+ TDESimpleConfig config( fileMap[ tmp ], true );
config.setGroup( "General" );
mDatePatternEdit->setText( config.readEntry( "DatePattern", "Y-M-D" ) );
uint numColumns = config.readUnsignedNumEntry( "Columns" );
@@ -848,7 +848,7 @@ void CSVImportDialog::applyTemplate()
void CSVImportDialog::saveTemplate()
{
TQString fileName = KFileDialog::getSaveFileName(
- locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ),
+ locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ),
"*.desktop", this );
if ( fileName.isEmpty() )
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index da91c019..2dce71f4 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -40,7 +40,7 @@ class TQTable;
class CSVImportDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h
index b6b34602..1f6007f5 100644
--- a/kaddressbook/xxport/eudora_xxport.h
+++ b/kaddressbook/xxport/eudora_xxport.h
@@ -28,7 +28,7 @@
class EudoraXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h
index b41aace1..c24c4b14 100644
--- a/kaddressbook/xxport/gnokii_xxport.h
+++ b/kaddressbook/xxport/gnokii_xxport.h
@@ -28,7 +28,7 @@
class GNOKIIXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 58ae2afd..6783e4d6 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -28,8 +28,8 @@
#include <tdeio/netaccess.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kurl.h>
diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h
index 694b0b1b..146fa117 100644
--- a/kaddressbook/xxport/kde2_xxport.h
+++ b/kaddressbook/xxport/kde2_xxport.h
@@ -28,7 +28,7 @@
class KDE2XXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h
index 1e8282a8..11cbd40b 100644
--- a/kaddressbook/xxport/ldif_xxport.h
+++ b/kaddressbook/xxport/ldif_xxport.h
@@ -29,7 +29,7 @@
class LDIFXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h
index ce0a33ec..e0723c58 100644
--- a/kaddressbook/xxport/opera_xxport.h
+++ b/kaddressbook/xxport/opera_xxport.h
@@ -29,7 +29,7 @@
class OperaXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 59c00f82..4d890b37 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -29,8 +29,8 @@
#include <tdeio/netaccess.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kurl.h>
diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h
index 796894a0..b3b6fb29 100644
--- a/kaddressbook/xxport/pab_xxport.h
+++ b/kaddressbook/xxport/pab_xxport.h
@@ -29,7 +29,7 @@
class PABXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 293879cc..797c31d7 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -239,9 +239,22 @@ TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
// With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1()
// and hope that are fields are encoded correctly.
- if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) {
+ bool useUtf8;
+ TQString tmp = TQString::fromLatin1(rawData).lower();
+ int ver = tmp.find("version:");
+ if (ver == -1) {
+ // no version info, assume utf8
+ useUtf8 = true;
+ }
+ else {
+ float vCardVersion = tmp.mid(ver + 8, tmp.find("\n", ver)).toFloat();
+ useUtf8 = (vCardVersion >= 3.0);
+ }
+
+ if (useUtf8) {
vCardText = TQString::fromUtf8( rawData );
- } else {
+ }
+ else {
vCardText = TQString::fromLatin1( rawData );
}
addrList += parseVCard( vCardText );
@@ -251,7 +264,7 @@ TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
} else {
TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" );
text = text.arg( (*it).url() );
- text = text.arg( kapp->translate( "TQFile",
+ text = text.arg( tdeApp->translate( "TQFile",
TQString(file.errorString()).latin1() ) );
KMessageBox::error( parentWidget(), text, caption );
anyFailures = true;
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index c5f66f93..780d7ccc 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -29,7 +29,7 @@
class VCardXXPort : public KAB::XXPort
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-01 16:38:32 +0000