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

List:       kde-commits
Subject:    KDE/kdeedu/kvoctrain/kvoctrain
From:       Thomas Häber <thomas () haeber ! de>
Date:       2006-10-01 2:06:32
Message-ID: 1159668392.597594.27905.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 590826 by haeber:

adding a single character as char/QChar to a string/QString is always faster than a \
single character as string/QString (EBN)

 M  +1 -1      common-dialogs/languageoptions.cpp  
 M  +1 -1      entry-dialogs/PhoneticEntryPage.cpp  
 M  +6 -6      kva_io.cpp  
 M  +1 -1      kvt-core/LineList.cpp  
 M  +1 -1      kvt-core/kvd_lex.cpp  
 M  +5 -5      kvt-core/kvd_wkvtml.cpp  
 M  +1 -1      kvtnewstuff.cpp  
 M  +6 -6      query-dialogs/ArtQueryDlg.cpp  
 M  +1 -1      spotlight2kvtml.cpp  
 M  +8 -8      statistik-dialogs/StatistikPage.cpp  


--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp \
#590825:590826 @@ -1205,7 +1205,7 @@
     lang = it.key();
     QString shortid = global_langset.shortId(it.value());
     QString short2id = global_langset.shortId2(it.value());
-    lang += "\t("+shortid+")";
+    lang += "\t("+shortid+')';
     QString pixmap = global_langset.PixMapFile(it.value());
     if (pixmap.isEmpty())
       pop->insertItem(lang, it.value());
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp \
#590825:590826 @@ -203,7 +203,7 @@
     connect (phoneticButton, SIGNAL(clicked()), phoneticButton, SLOT(slotClicked()) \
);  QString tip = i18n("Unicode name: ");
     tip += QString::fromLatin1(uni_ref->unicodename);
-    tip += "\n";
+    tip += '\n';
     tip += i18nc("Describing the sound of the character", "Sound: ");
     tip += i18n(uni_ref->audible);
     phoneticButton->setFont(ipafont);
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kva_io.cpp #590825:590826
@@ -500,9 +500,9 @@
   slotStatusMsg(msg);
 
   // remove previous backup
-  QFile::remove(QFile::encodeName(doc->URL().path()+"~"));
+  QFile::remove(QFile::encodeName(doc->URL().path()+'~'));
   ::rename (QFile::encodeName(doc->URL().path()),
-            QFile::encodeName(doc->URL().path()+"~"));
+            QFile::encodeName(doc->URL().path()+'~'));
 
   prepareProgressBar();
   saveDocProps(doc);
@@ -604,8 +604,8 @@
       QString msg = i18n("Saving %1", url.path());
       slotStatusMsg(msg);
 
-      QFile::remove(QFile::encodeName(url.path()+"~"));         // remove previous \
                backup
-      ::rename (QFile::encodeName(url.path()), \
QFile::encodeName(QString(url.path()+"~"))); +      \
QFile::remove(QFile::encodeName(url.path()+'~')); // remove previous backup +      \
::rename (QFile::encodeName(url.path()), QFile::encodeName(QString(url.path()+'~'))); \
saveDocProps(doc);  
       prepareProgressBar();
@@ -655,9 +655,9 @@
       QString msg = i18n("Saving %1", url.path());
       slotStatusMsg(msg);
 
-      QFile::remove(url.path()+"~");         // remove previous backup
+      QFile::remove(url.path()+'~'); // remove previous backup
       // FIXME: check error
-      ::rename (QFile::encodeName(url.path()), QFile::encodeName(url.path()+"~"));
+      ::rename (QFile::encodeName(url.path()), QFile::encodeName(url.path()+'~'));
       saveDocProps(&seldoc);
 
       prepareProgressBar();
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kvt-core/LineList.cpp #590825:590826
@@ -88,7 +88,7 @@
 
    if (multilines.size() > 1) {
      for (int i = 1; i < (int) multilines.size(); i++)
-       ret += "\n" + multilines[i];
+       ret += '\n' + multilines[i];
    }
    return ret;
 }
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp #590825:590826
@@ -169,7 +169,7 @@
     s = is.readLine();
     lesson = extract (s);
     if (lesson.simplified().isEmpty()) {
-      lesson = "#" + QString::number(i+1);
+      lesson = '#' + QString::number(i+1);
     }
     lesson_descr.push_back (lesson);
   }
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp #590825:590826
@@ -317,7 +317,7 @@
   xml.writeText(identstr);
   xml.startTag (KV_COMPARISON_GRP, false);
   xml.closeTag(false, true);
-  xml.writeText(identstr+" ");
+  xml.writeText(identstr+' ');
 
   if (!comp.l1().isEmpty() ) {
     xml.startTag (KV_COMP_L1, true, false, false);
@@ -337,7 +337,7 @@
     xml.endTag (KV_COMP_L3, false);
   }
 
-  xml.writeText("\n"+identstr);
+  xml.writeText('\n'+identstr);
   xml.endTag (KV_COMPARISON_GRP, true);
   xml.writeText(identstr);   // indent next element
   return true;
@@ -367,7 +367,7 @@
   xml.writeText(identstr);
   xml.startTag (KV_MULTIPLECHOICE_GRP, false);
   xml.closeTag(false, true);
-  xml.writeText(identstr+" ");
+  xml.writeText(identstr+' ');
 
   if (!mc.mc1().isEmpty() ) {
     xml.startTag (KV_MC_1, true, false, false);
@@ -399,7 +399,7 @@
     xml.endTag (KV_MC_5, false);
   }
 
-  xml.writeText("\n"+identstr);
+  xml.writeText('\n'+identstr);
   xml.endTag (KV_MULTIPLECHOICE_GRP, true);
   xml.writeText(identstr);   // indent next element
   return true;
@@ -442,7 +442,7 @@
   QString def, indef, s;
   QString type;
   for (int lfn = 0; lfn < (int) curr_conjug.numEntries(); lfn++) {
-    xml.writeText(identstr+" ");            // indent entry a bit
+    xml.writeText(identstr+' ');            // indent entry a bit
     xml.startTag (KV_CON_TYPE, false);
     type = curr_conjug.getType(lfn);
     xml.addAttribute (KV_CON_NAME, type);
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kvtnewstuff.cpp #590825:590826
@@ -56,7 +56,7 @@
       file = KNewStuff::downloadDestination(entry); //fall back on a temp file, \
should never happen  else
     {
-      file = QDir::home().path() + "/" + path + "/";
+      file = QDir::home().path() + '/' + path + '/';
       KStandardDirs::makeDir(file); //ensure the directory exists
       file += fileName;
     }
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp #590825:590826
@@ -118,11 +118,11 @@
    articles.female(def, indef);
    mw->rb_fem->setText (i18n("&female:\t")+def+" / "+indef);
    mw->rb_fem->setEnabled (!QString(def+indef).isEmpty() );
-   if (!removed && s.indexOf(def+" ") == 0) {
+   if (!removed && s.indexOf(def+' ') == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.indexOf(indef+" ") == 0) {
+   if (!removed && s.indexOf(indef+' ') == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -130,11 +130,11 @@
    articles.male(def, indef);
    mw->male->setText (i18n("&male:\t")+def+" / "+indef);
    mw->male->setEnabled (!QString(def+indef).isEmpty() );
-   if (!removed && s.indexOf(def+" ") == 0) {
+   if (!removed && s.indexOf(def+' ') == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.indexOf(indef+" ") == 0) {
+   if (!removed && s.indexOf(indef+' ') == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -142,11 +142,11 @@
    articles.natural(def, indef);
    mw->natural->setText (i18n("&natural:\t")+def+" / "+indef);
    mw->natural->setEnabled (!QString(def+indef).isEmpty() );
-   if (!removed && s.indexOf(def+" ") == 0) {
+   if (!removed && s.indexOf(def+' ') == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.indexOf(indef+" ") == 0) {
+   if (!removed && s.indexOf(indef+' ') == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/spotlight2kvtml.cpp #590825:590826
@@ -135,7 +135,7 @@
 
        if (head_line) {
          lesson_pending = true;
-         lesson_str = line + ", "+month+" "+year;
+         lesson_str = line + ", "+month+' '+year;
        }
        else {
          pos = line.indexOf ('\t');
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp \
#590825:590826 @@ -275,14 +275,14 @@
 
   KMenu *header_m = new KMenu(i18n("Number of Entries per Grade"));
 
-  header_m->insertItem (i18n(KV_NORM_TEXT) + "\t" + \
                QString::number(sc->grade[KV_NORM_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV1_TEXT) + "\t" + \
                QString::number(sc->grade[KV_LEV1_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV2_TEXT) + "\t" + \
                QString::number(sc->grade[KV_LEV2_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV3_TEXT) + "\t" + \
                QString::number(sc->grade[KV_LEV3_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV4_TEXT) + "\t" + \
                QString::number(sc->grade[KV_LEV4_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV5_TEXT) + "\t" + \
                QString::number(sc->grade[KV_LEV5_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV6_TEXT) + "\t" + \
                QString::number(sc->grade[KV_LEV6_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV7_TEXT) + "\t" + \
QString::number(sc->grade[KV_LEV7_GRADE]) ); +  header_m->insertItem \
(i18n(KV_NORM_TEXT) + '\t' + QString::number(sc->grade[KV_NORM_GRADE]) ); +  \
header_m->insertItem (i18n(KV_LEV1_TEXT) + '\t' + \
QString::number(sc->grade[KV_LEV1_GRADE]) ); +  header_m->insertItem \
(i18n(KV_LEV2_TEXT) + '\t' + QString::number(sc->grade[KV_LEV2_GRADE]) ); +  \
header_m->insertItem (i18n(KV_LEV3_TEXT) + '\t' + \
QString::number(sc->grade[KV_LEV3_GRADE]) ); +  header_m->insertItem \
(i18n(KV_LEV4_TEXT) + '\t' + QString::number(sc->grade[KV_LEV4_GRADE]) ); +  \
header_m->insertItem (i18n(KV_LEV5_TEXT) + '\t' + \
QString::number(sc->grade[KV_LEV5_GRADE]) ); +  header_m->insertItem \
(i18n(KV_LEV6_TEXT) + '\t' + QString::number(sc->grade[KV_LEV6_GRADE]) ); +  \
header_m->insertItem (i18n(KV_LEV7_TEXT) + '\t' + \
QString::number(sc->grade[KV_LEV7_GRADE]) );  
   header_m->exec(QCursor::pos()+QPoint(10, 0));
 }


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

Configure | About | News | Add a list | Sponsored by KoreLogic