Changeset 5448 for trunk/qt-gui/src/mainwin.cpp

Timestamp:

09/29/07 04:08:39 (14 months ago)

Author:

flynd

Message:

Merged a few fixes from qt4-gui.
- r5444,r5447: Don't mess with mainwin placement, fixes #291.
- r5445: Include delimiter in first part when doing message splitting, fixes #815.

Files:

• trunk/qt-gui/src/mainwin.cpp (modified) (1 diff)

trunk/qt-gui/src/mainwin.cpp

@@ -1225 +1225 @@
     licqConf.LoadFile(buf);
 
-    int x, y;
-    if(pos().x() < 2 || pos().y() < 2) {
-      // WMaker bug.  will investigate...
-      QPoint p  = mapToGlobal(QPoint(0, 0));
-
-//      qDebug("wmaker workaround enabled");
-
-      x = p.x() - 1 - ( geometry().x() < p.x() ? geometry().x() : 0);
-      y = p.y() - 1 - ( geometry().y() < p.y() ? geometry().y() : 0);
-    }
-    else
-    {
-      x = pos().x();
-      y = pos().y();
-    }
-
-    x = x < 0 ? 0 : x;
-    y = y < 0 ? 0 : y;
-
     licqConf.SetSection("geometry");
     // I'm not sure if we should really test for negative values...
-    licqConf.WriteNum("x", (unsigned short)x);
-    licqConf.WriteNum("y", (unsigned short)y);
+    licqConf.WriteNum("x", static_cast<short>(x()));
+    licqConf.WriteNum("y", static_cast<short>(y()));
     licqConf.WriteNum("h", (unsigned short)(size().height() < 0 ? 0 : (m_bInMiniMode ? m_nRealHeight : size().height())));
     licqConf.WriteNum("w", (unsigned short)(size().width() < 0 ? 0 : size().width()));