From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sat, 26 Jul 2008 11:46:30 +0000 (+0200)
Subject: this should really - fingers crossed - make the client compile with Qt 4.3 again
X-Git-Tag: 0.3.0~214
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=3e4bd5ae86319de1a63622144bb0bbbf977b8478

this should really - fingers crossed - make the client compile with Qt 4.3 again
---

diff --git a/src/qtui/channellistdlg.cpp b/src/qtui/channellistdlg.cpp
index 97d801bc..2e26484d 100644
--- a/src/qtui/channellistdlg.cpp
+++ b/src/qtui/channellistdlg.cpp
@@ -108,31 +108,11 @@ void ChannelListDlg::enableQuery(bool enable) {
 void ChannelListDlg::setAdvancedMode(bool advanced) {
   _advancedMode = advanced;
 
-  QHBoxLayout *searchLayout = 0;
 #if QT_VERSION >=  0x040400
-  searchLayout = ui.searchLayout;
-#else
-  // FIXME: REMOVE WHEN WE DEPEND ON Qt 4.4
-  /*
-   * ok this just sucks: in Qt 4.3 there is no way to search for a layout as uic creates
-   * them without a parent -.-
-   * in this case there are only 2 candidates: ui.hboxLayout and ui.hboxLayout1
-   */
-  if(ui.hboxLayout.findWidget(ui.searchPatternLabel) != -1)
-    searchLayout = ui.hboxLayout;
-  else if(ui.hboxLayout1.findWidget(ui.searchPatternLabel) != -1)
-    searchLayout = ui.hboxLayout1;
-  else
-    /* if this assert trigger we have been compiled on a too old Qt
-     * or uic generated something very unexpected. we cannot find the layout to manipulate.
-     * Please upgrade to a recent version of Qt.
-     */
-    Q_ASSERT(false);
-#endif
-
+  // FIXME: remove if macro when we depend on Qt 4.4
   if(advanced) {
     if(_simpleModeSpacer) {
-      searchLayout->removeItem(_simpleModeSpacer);
+      ui.searchLayout->removeItem(_simpleModeSpacer);
       delete _simpleModeSpacer;
       _simpleModeSpacer = 0;
     }
@@ -140,10 +120,12 @@ void ChannelListDlg::setAdvancedMode(bool advanced) {
   } else {
     if(!_simpleModeSpacer) {
       _simpleModeSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-      searchLayout->insertSpacerItem(0, _simpleModeSpacer);
+      ui.searchLayout->insertSpacerItem(0, _simpleModeSpacer);
     }
     ui.advancedModeLabel->setPixmap(QPixmap(QString::fromUtf8(":/22x22/actions/oxygen/22x22/actions/edit-clear.png")));
   }
+#endif
+  
   ui.channelNameLineEdit->clear();
   ui.channelNameLineEdit->setVisible(advanced);
   ui.searchPatternLabel->setVisible(advanced);