[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kpilot/kpilot
From:       Adriaan de Groot <groot () kde ! org>
Date:       2005-02-06 15:01:41
Message-ID: 20050206150141.5EEC81B3DA () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

latin1 -> proper charset conversion, patch by Sergei, who shows that my assumption \
that dbnames are latin1 on the HH is wrong


  M +2 -1      conduitConfigDialog.cc   1.64
  M +1 -1      dbFlagsEditor.cc   1.13
  M +7 -8      hotSync.cc   1.52


--- kdepim/kpilot/kpilot/conduitConfigDialog.cc  #1.63:1.64
@@ -58,4 +58,5 @@ static const char *conduitconfigdialog_i
 #include <kconfigskeleton.h>
 
+#include "uiDialog.h"
 #include "plugin.h"
 #include "kpilotConfig.h"

--- kdepim/kpilot/kpilot/dbFlagsEditor.cc  #1.12:1.13
@@ -61,5 +61,5 @@ void DBFlagsEditor::slotOk()
         if (KMessageBox::questionYesNo(this, i18n("Changing the database flags might \
corrupt the whole database, or make the data unusable. Do not change the values \
unless you are absolutely sure you know what you are doing.\n\nReally assign these \
new flags?"), i18n("Changing Database Flags"))==KMessageBox::Yes)  {
-                strlcpy(dbi->name, widget->fDBName->text().latin1(), 33);
+                strlcpy(dbi->name, \
PilotAppCategory::codec()->fromUnicode(widget->fDBName->text()), 33);  
                 char buff[5];

--- kdepim/kpilot/kpilot/hotSync.cc  #1.51:1.52
@@ -110,5 +110,5 @@ TestLink::TestLink(KPilotDeviceLink * p)
                 // Pretty sure all database names are in latin1.
                 emit logMessage(i18n("Syncing database %1...")
-                        .arg(QString::fromLatin1(db.name)));
+                        .arg(PilotAppCategory::codec()->toUnicode(db.name)));
 
                 kapp->processEvents();
@@ -183,5 +183,5 @@ static inline bool dontBackup(struct DBI
 
         // Now take wildcards into account
-        QString db = QString::fromLatin1(info->name);
+        QString db = PilotAppCategory::codec()->toUnicode(info->name);
         for (QStringList::const_iterator i = dbnames.begin(); i != dbnames.end(); \
++i)  {
@@ -392,5 +392,5 @@ bool BackupAction::checkBackupDirectory(
 #endif
                 QString s = i18n("Skipping %1")
-                        .arg(QString::fromLatin1(info.name));
+                        .arg(PilotAppCategory::codec()->toUnicode(info.name));
                 addSyncLogEntry(s);
                 return;
@@ -403,7 +403,6 @@ bool BackupAction::checkBackupDirectory(
         }
 
-        // Pretty sure all database names are latin1.
         QString s = i18n("Backing up: %1")
-                .arg(QString::fromLatin1(info.name));
+                .arg(PilotAppCategory::codec()->toUnicode(info.name));
         addSyncLogEntry(s);
 
@@ -414,5 +413,5 @@ bool BackupAction::checkBackupDirectory(
                         << info.name << endl;
                 addSyncLogEntry(i18n("Backup of %1 failed.\n")
-                        .arg(QString::fromLatin1(info.name)));
+                        .arg(PilotAppCategory::codec()->toUnicode(info.name)));
         }
         else
@@ -426,5 +425,5 @@ bool BackupAction::createLocalDatabase(D
         FUNCTIONSETUP;
 
-        QString databaseName(QString::fromLatin1(info->name));
+        QString databaseName(PilotAppCategory::codec()->toUnicode(info->name));
         if (!fFullBackup)
         {


[prev in list] [next in list] [prev in thread] [next in thread]