Changeset 5030

Timestamp:

07/18/07 18:57:43 (17 months ago)

Author:

flynd

Message:

Changed Qt requirement to 4.3.0. Also removed some code and workarounds for older Qt versions.

Location:

branches/qt-gui_qt4

Files:

• CMakeLists.txt (modified) (1 diff)
• src/contactlist/maincontactlistproxy.cpp (modified) (2 diffs)
• src/contactlist/sortedcontactlistproxy.cpp (modified) (1 diff)
• src/mainwin.cpp (modified) (1 diff)
• src/mledit.cpp (modified) (1 diff)
• src/mledit.h (modified) (1 diff)
• src/mlview.cpp (modified) (2 diffs)
• src/mlview.h (modified) (1 diff)
• src/widgets/tabwidget.cpp (modified) (1 diff)
• src/widgets/tabwidget.h (modified) (1 diff)

branches/qt-gui_qt4/CMakeLists.txt

@@ -55 +55 @@
 
 # Check for Qt4
-set(QT_MIN_VERSION "4.2.1")
+set(QT_MIN_VERSION "4.3.0")
 set(QT_USE_QT3SUPPORT TRUE)
 

branches/qt-gui_qt4/src/contactlist/maincontactlistproxy.cpp

@@ -38 +38 @@
 {
   m_filterSystemGroups = enable;
-#if QT_VERSION < 0x040300
-  // filterChanged() is obsoleted in Qt 4.3 and should be replaced by invalidateFilter()
-  filterChanged();
-#else
   invalidateFilter();
-#endif
 }
 
@@ -49 +44 @@
 {
   m_filterSubGroups = enable;
-#if QT_VERSION < 0x040300
-  // filterChanged() is obsoleted in Qt 4.3 and should be replaced by invalidateFilter()
-  filterChanged();
-#else
   invalidateFilter();
-#endif
 }
 
 void CMainContactListProxy::configUpdated()
 {
-#if QT_VERSION < 0x040300
-  // filterChanged() is obsoleted in Qt 4.3 and should be replaced by invalidateFilter()
-  filterChanged();
-#else
   invalidateFilter();
-#endif
 }
 

branches/qt-gui_qt4/src/contactlist/sortedcontactlistproxy.cpp

@@ -45 +45 @@
   // The value of m_sortOrder affects the behaviour of our lessThan() method
   //   so tell QSortFilterProxyModel to forget any cached values from lessThan()
-#if QT_VERSION < 0x040300
-  // clear() is obsoleted in Qt 4.3 and should be replaced by invalidate()
-  clear();
-#else
   invalidate();
-#endif
   QSortFilterProxyModel::sort(column, Qt::AscendingOrder);
 }

branches/qt-gui_qt4/src/mainwin.cpp

@@ -4702 +4702 @@
   
   // The send submenu and misc modes submenu that depend on sending capabilities
-#if QT_VERSION >= 0x030100
 #define HIDE_MENU(x, y, z) x->setItemVisible(y, z);
-#else
-#define HIDE_MENU(x, y, z) x->setItemEnabled(y, false);
-#endif
 
   HIDE_MENU(mnuUser, mnuUserSendMsg, nSendFuncs & PP_SEND_MSG)

branches/qt-gui_qt4/src/mledit.cpp

@@ -62 +62 @@
   GotoEnd();
   insert(s);
-}
-
-void MLEditWrap::append(const QString& s)
-{
-  MLEditWrapBase::append(s);
-  if (strcmp(qVersion(), "3.0.0") == 0 ||
-      strcmp(qVersion(), "3.0.1") == 0 ||
-      strcmp(qVersion(), "3.0.2") == 0 ||
-      strcmp(qVersion(), "3.0.3") == 0 ||
-      strcmp(qVersion(), "3.0.4") == 0)
-  {
-    // Workaround --
-    // In those versions, QTextEdit::append didn't add a new paragraph.
-    MLEditWrapBase::append("\n");
-  }
 }
 

branches/qt-gui_qt4/src/mledit.h

@@ -59 +59 @@
 
   void appendNoNewLine(const QString& s);
-  void append(const QString& s);
   void GotoEnd();
 

branches/qt-gui_qt4/src/mlview.cpp

@@ -38 +38 @@
 {
   setWordWrap(WidgetWidth);
-#if QT_VERSION >= 0x030100
   setWrapPolicy(AtWordOrDocumentBoundary);
-#else
-  setWrapPolicy(AtWhiteSpace);
-#endif
   setReadOnly(true);
   setTextFormat(Qt::RichText);
@@ -51 +47 @@
   int p = paragraphs() - 1;
   insertAt(s, p, paragraphLength(p));
-}
-
-void MLView::append(const QString& s)
-{
-  if (strcmp(qVersion(), "3.0.0") == 0 ||
-      strcmp(qVersion(), "3.0.1") == 0 ||
-      strcmp(qVersion(), "3.0.2") == 0 ||
-      strcmp(qVersion(), "3.0.3") == 0 ||
-      strcmp(qVersion(), "3.0.4") == 0)
-  {
-    // Workaround --
-    // In those versions, QTextEdit::append didn't add a new paragraph.
-    Q3TextBrowser::append("<p>" + s);
-  }
-  else
-    Q3TextBrowser::append(s);
 }
 

branches/qt-gui_qt4/src/mlview.h

@@ -33 +33 @@
 
   void appendNoNewLine(const QString& s);
-  void append(const QString& s);
   void GotoHome();
   void GotoEnd();

branches/qt-gui_qt4/src/widgets/tabwidget.cpp

@@ -61 +61 @@
   e->accept();
 }
-
-#if QT_VERSION < 0x040300
-// tabAt() is added in Qt 4.3 so we have to make our own implementation for QT 4.2
-int CTabBar::tabAt(const QPoint& position) const
-{
-  for (int i = 0; i < count(); ++i)
-    if (tabRect(i).contains(position))
-      return i;
-
-  return -1;
-}
-#endif
 
 void CTabBar::mousePressEvent(QMouseEvent* e)

branches/qt-gui_qt4/src/widgets/tabwidget.h

@@ -42 +42 @@
   virtual void mouseReleaseEvent(QMouseEvent* e);
 
-#if QT_VERSION < 0x040300
-  // tabAt is added in Qt 4.3 so we have to make our own implementation for QT 4.2
-  int tabAt(const QPoint& position) const;
-#endif
-
   int clickedTab;
 };