Bläddra i källkod

Removed unused Q3CString instanceName; in debugPause and debugReset.
Remove unused #include <Q3CString> in preferences.cpp.
Use QByteArray instead of Q3CString in process_settings.
Convert remaining direct libticonv calls to use TiconvTextCodec.


git-svn-id: file:///var/svn/tigccpp/trunk@1014 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler 17 år sedan
förälder
incheckning
5b534c97fa
4 ändrade filer med 12 tillägg och 42 borttagningar
  1. 2 4
      ktigcc/mainform.cpp
  2. 0 1
      ktigcc/preferences.cpp
  3. 7 34
      ktigcc/tpr.cpp
  4. 3 3
      ktigcc/tpr.h

+ 2 - 4
ktigcc/mainform.cpp

@@ -67,7 +67,7 @@ class DnDListView : public K3ListView {
 #include <QImage>
 #include <QString>
 #include <QStringList>
-#include <Q3CString>
+#include <QByteArray>
 #include <QPair>
 #include <QRegExp>
 #include <QApplication>
@@ -4435,7 +4435,7 @@ void MainForm::linkProject()
     // Link executable using ld-tigcc.
     QString linkOutput=settings.pack?QString("%1/tempprog").arg(tempdir)
                                     :projectBaseName;
-    Q3CString projectName, dataVarName, packFolder, packName;
+    QByteArray projectName, dataVarName, packFolder, packName;
     QStringList linkerOptions=process_settings(rootListItem->text(0),
                                                projectName,dataVarName,
                                                packFolder,packName);
@@ -5156,7 +5156,6 @@ void MainForm::debugRun()
 void MainForm::debugPause()
 {
   // This is enabled only for LT_TIEMU. Run the TiEmu debugger.
-  Q3CString instanceName;
   TiEmuDBus *tiemuDBus;
   if (!tiemuInstance(tiemuDBus) || !tiemuDBus) return;
   if (!tiemuDBus->enter_debugger().isValid())
@@ -5167,7 +5166,6 @@ void MainForm::debugPause()
 void MainForm::debugReset()
 {
   // This is enabled only for LT_TIEMU. Reset TiEmu.
-  Q3CString instanceName;
   TiEmuDBus *tiemuDBus;
   if (!tiemuInstance(tiemuDBus) || !tiemuDBus) return;
   if (!tiemuDBus->reset_calc(FALSE).isValid())

+ 0 - 1
ktigcc/preferences.cpp

@@ -35,7 +35,6 @@
 #include <QDomNode>
 #include <QDomAttr>
 #include <QDomText>
-#include <Q3CString>
 #include <QDir>
 #include <QPair>
 #include <Q3ValueList>

+ 7 - 34
ktigcc/tpr.cpp

@@ -37,7 +37,6 @@
 #include <QString>
 #include <QStringList>
 #include <QByteArray>
-#include <Q3CString>
 #include <QRegExp>
 #include <QTextCodec>
 #include <QDir>
@@ -1337,20 +1336,13 @@ QStringList process_libopts(void)
    Build linker command line arguments
 */
 QStringList process_settings(const QString &prjNameUnicode,
-                             Q3CString &projectName, Q3CString &dataVarName,
-                             Q3CString &packFolder, Q3CString &packName)
+                             QByteArray &projectName, QByteArray &dataVarName,
+                             QByteArray &packFolder, QByteArray &packName)
 {
   QStringList args;
 
   // Convert the project name to the calculator charset.
-  {
-    const unsigned short *utf16=prjNameUnicode.utf16();
-    if (utf16) {
-      char *ti=ticonv_charset_utf16_to_ti(CALC_TI89,utf16);
-      projectName=ti; // This is a hidden strdup (see QCString::operator=).
-      g_free(ti);
-    } else projectName=Q3CString();
-  }
+  projectName=TiconvTextCodec::instance->fromUnicode(prjNameUnicode);
 
   // Split the PPG name into folder and file.
   QString packFolderUnicode, packNameUnicode;
@@ -1363,40 +1355,21 @@ QStringList process_settings(const QString &prjNameUnicode,
   }
 
   // Convert the PPG folder name to the calculator charset.
-  {
-    const unsigned short *utf16=packFolderUnicode.utf16();
-    if (utf16) {
-      char *ti=ticonv_charset_utf16_to_ti(CALC_TI89,utf16);
-      packFolder=ti; // This is a hidden strdup (see QCString::operator=).
-      g_free(ti);
-    } else packFolder=Q3CString();
-  }
+  packFolder=TiconvTextCodec::instance->fromUnicode(packFolderUnicode);
 
   // Convert the PPG file name to the calculator charset.
-  {
-    const unsigned short *utf16=packNameUnicode.utf16();
-    if (utf16) {
-      char *ti=ticonv_charset_utf16_to_ti(CALC_TI89,utf16);
-      packName=ti; // This is a hidden strdup (see QCString::operator=).
-      g_free(ti);
-    } else packName=Q3CString();
-  }
+  packName=TiconvTextCodec::instance->fromUnicode(packNameUnicode);
 
   if (settings.use_data_var && !settings.data_var.isEmpty()) {
     // We can't just append this to the argument list because this needs to be
     // in the calculator charset.
-    const unsigned short *utf16=settings.data_var.utf16();
-    if (utf16) {
-      char *ti=ticonv_charset_utf16_to_ti(CALC_TI89,utf16);
-      dataVarName=ti; // This is a hidden strdup (see QCString::operator=).
-      g_free(ti);
-    } else dataVarName=Q3CString();
+    dataVarName=TiconvTextCodec::instance->fromUnicode(settings.data_var);
     if (!settings.copy_data_var) {
       args.append("--data-var-copy=never");
     } else if (!settings.copy_data_var_arc) {
       args.append("--data-var-copy=always");
     }
-  } else dataVarName=Q3CString();
+  } else dataVarName=QByteArray();
 
   if (settings.optimize_nops) {
     args.append("--optimize-nops");

+ 3 - 3
ktigcc/tpr.h

@@ -26,7 +26,7 @@
 class KUrl;
 #include <QString>
 #include <QStringList>
-#include <Q3CString>
+#include <QByteArray>
 #include <Q3ValueVector>
 #include <QPair>
 #include <QTextCodec>
@@ -188,8 +188,8 @@ int getPathType(const QString &thePath);
 
 QStringList process_libopts(void);
 QStringList process_settings(const QString &prjNameUnicode,
-                             Q3CString &projectName, Q3CString &dataVarName,
-                             Q3CString &packFolder, Q3CString &packName);
+                             QByteArray &projectName, QByteArray &dataVarName,
+                             QByteArray &packFolder, QByteArray &packName);
 
 class TiconvTextCodec : public QTextCodec {
   public: