Changeset 33 in tspsg-svn for trunk

Timestamp:

Jun 30, 2009, 7:14:52 PM (15 years ago)

Author:

laleppa

Message:

Code tweaks to compile without errors using Qt < 4.5.

Location:

trunk

Files:

• src/main.cpp (modified) (1 diff)
• src/mainwindow.cpp (modified) (3 diffs)
• tspsg.pri (modified) (1 diff)

trunk/src/main.cpp

@@ -27 +27 @@
 {
 QApplication app(argc, argv);
+        QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf8"));
+        QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf8"));
+        QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
         app.setOrganizationName("..::Lёppsville::..");
         app.setOrganizationDomain("www.leppsville.com");
         app.setApplicationName("TSPSG");
-        QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
 MainWindow mainwindow;
         mainwindow.show();

trunk/src/mainwindow.cpp

@@ -196 +196 @@
 {
 QPrintDialog pd(printer,this);
+#if QT_VERSION >= 0x040500
+        // No such methods in Qt < 4.5
         pd.setOption(QAbstractPrintDialog::PrintSelection,false);
         pd.setOption(QAbstractPrintDialog::PrintPageRange,false);
+#endif
         pd.exec();
 }
@@ -253 +256 @@
 {
 QSettings langinfo("i18n/languages.ini",QSettings::IniFormat);
+#if QT_VERSION >= 0x040500
+        // In Qt < 4.5 QSettings doesn't have method setIniCodec.
         langinfo.setIniCodec("UTF-8");
+#endif
 QDir dir("i18n","*.qm",QDir::Name | QDir::IgnoreCase,QDir::Files);
         if (!dir.exists())
@@ -264 +270 @@
                 QFileInfo lang = langs.at(k);
                 if (!lang.completeBaseName().startsWith("qt_") && lang.completeBaseName().compare("en")) {
+#if QT_VERSION >= 0x040500
                         a = menuSettingsLanguage->addAction(langinfo.value(lang.completeBaseName() + "/NativeName",lang.completeBaseName()).toString());
+#else
+                        // We use Name if Qt < 4.5 because NativeName is in UTF-8, QSettings
+                        // reads .ini file as ASCII and there is no way to set file encoding.
+                        a = menuSettingsLanguage->addAction(langinfo.value(lang.completeBaseName() + "/Name",lang.completeBaseName()).toString());
+#endif
                         a->setData(lang.completeBaseName());
                         a->setCheckable(true);

trunk/tspsg.pri

@@ -21 +21 @@
 
 #Source files
-SOURCES += ./src/main.cpp \
+SOURCES += src/main.cpp \
         src/mainwindow.cpp \
         src/settingsdialog.cpp \