Changeset 412 for trunk/src

Timestamp:

Dec 10, 2009, 10:30:10 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Made it build using GCC4 and fixed a couple warnings.

Location:

trunk/src

Files:

• 3rdparty/freetype/include/freetype/config/ftheader.h (modified) (2 diffs)
• gui/kernel/qapplication_pm.cpp (modified) (4 diffs)
• gui/kernel/qclipboard_pm.cpp (modified) (1 diff)

trunk/src/3rdparty/freetype/include/freetype/config/ftheader.h

@@ -171 +171 @@
    *
    */
-#if defined(__OS2__) && defined(__GNUC__)
-# if __GNUC__ == 3 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ == 5
+#if defined(__OS2__) && defined(__GNUC__)
+ __GNUC__ == 3 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ == 5
     // GCC for OS/2 version 3.3.5 CSD3 doesn't like the style of the
     // comments in the ../3rdparty/freetype/include/freetype/freetype.h file
@@ -181 +181 @@
     // Until we upgrade GCC to a version that is free of it, we use this sed'ed
     // header as a temporary workaround.
-#  define FT_FREETYPE_H  <freetype/freetype.os2-g++.h>
-# else
-    // On a newer compiler that works, we should completely remove any traces of
-    // this workaround from this file
-#  error "Please check the comment above this line!"
-# endif
+# define FT_FREETYPE_H  <freetype/freetype.os2-g++.h>
 #else
 #define FT_FREETYPE_H  <freetype/freetype.h>

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -111 +111 @@
 extern void qt_WinQueryClipRegionOrRect(HWND hwnd, HRGN hrgn); // qwidget_pm.cpp
 
+
+
 extern QRegion qt_dirtyRegion(QWidget *); // qbackingstore.cpp
 
@@ -156 +158 @@
 }
 
-static QFont qt_sysfont2qfont(const PSZ scope)
+static QFont qt_sysfont2qfont(SZ scope)
 {
     // note: 10.System Proportional is de-facto the default font selected into
     // the presentation space
 
-    static const PSZ app = "PM_SystemFonts";
-    static const PSZ def = "10.System Proportional";
+    static SZ app = "PM_SystemFonts";
+    static SZ def = "10.System Proportional";
 
     ULONG keyLen = 0;
-    QFont f("System Proportional", 10);
+    QFont f(, 10);
 
     if (PrfQueryProfileSize(HINI_USERPROFILE, app, scope, &keyLen) && keyLen) {
@@ -1321 +1323 @@
                 WinSetPointer(HWND_DESKTOP, QCursor(Qt::ArrowCursor).handle());
 #endif // QT_NO_CURSOR
-        } else if (type == WM_BUTTON1DOWN || type == type == WM_BUTTON2DOWN ||
+        } else if (type == WM_BUTTON1DOWN || type == WM_BUTTON2DOWN ||
                    type == WM_BUTTON3DOWN) {
             if (!top->isActiveWindow()) {
@@ -2308 +2310 @@
                     repeat, scan, ch, (ch > 32 && ch < 254) ?
                     qPrintable(QString::fromLocal8Bit((char *)&ch, 1)) :
-                    qPrintable(QString(QChar(' '))), vk);
+                    qPrintable(QString(QChar())), vk);
         QString flstr;
         myDefFlagEx(fl, KC_CHAR, flstr, "CHAR");

trunk/src/gui/kernel/qclipboard_pm.cpp

@@ -68 +68 @@
 
 QT_BEGIN_NAMESPACE
+
+
 
 ////////////////////////////////////////////////////////////////////////////////