[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Konversation] bd59df9: Revert "emulate
From:       Modestas Vainius <modestas () vainius ! eu>
Date:       2010-04-12 21:36:11
Message-ID: 201004122136.o3CLaB9T029767 () kore ! kollide ! net
[Download RAW message or body]

commit bd59df98aa8e92791baf1a34fb7707fe85773521
Author: Modestas Vainius <modestas@vainius.eu>
Date:   Tue Apr 13 00:37:09 2010 +0300

    Revert "emulate QTreeWidgetItem::emitDataChanged() for Qt 4.4"
    
    This reverts commit c59a10fe9c55fed6da25eb8973859219eb91da6d.
    
    This code is no longer need because Qt 4.4 is no longer supported.
    
    Conflicts:
    
    	src/commit.h
    	src/irc/nick.cpp

diff --git a/src/irc/nick.cpp b/src/irc/nick.cpp
index 39244e0..4e460b7 100644
--- a/src/irc/nick.cpp
+++ b/src/irc/nick.cpp
@@ -32,9 +32,6 @@ Nick::Nick(NickListView *listView, Channel* channel, const ChannelNickPtr& chann
     Q_ASSERT(m_channel);
 
     m_flags = 0;
-#if (QT_VERSION < QT_VERSION_CHECK(4, 5, 0))
-    m_emitDataChanged = 0;
-#endif
 
     refresh();
 
@@ -141,21 +138,6 @@ void Nick::refresh()
     }
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(4, 5, 0))
-static QVariant emitDataChangedQVariants[] = { QVariant(0), QVariant(1) };
-#endif
-
-void Nick::emitDataChanged()
-{
-#if (QT_VERSION < QT_VERSION_CHECK(4, 5, 0))
-    m_emitDataChanged = !m_emitDataChanged;
-    int sortCol = treeWidget()->header()->sortIndicatorSection();
-    setData((sortCol > 0) ? sortCol : 0, Qt::UserRole, emitDataChangedQVariants[m_emitDataChanged]);
-#else
-    QTreeWidgetItem::emitDataChanged();
-#endif
-}
-
 // Triggers reposition of this nick (QTreeWidgetItem) in the nick list
 void Nick::repositionMe()
 {
diff --git a/src/irc/nick.h b/src/irc/nick.h
index 2441701..ec9e8e5 100644
--- a/src/irc/nick.h
+++ b/src/irc/nick.h
@@ -36,8 +36,6 @@ class Nick : public QTreeWidgetItem
 
         void refresh();
         void repositionMe();
-        // Compatibility with Qt 4.4 + make it public for >= Qt 4.5
-        void emitDataChanged();
 
     protected:
         QString calculateLabel1() const;
@@ -56,10 +54,5 @@ class Nick : public QTreeWidgetItem
             NicknameColumn = 0,
             HostmaskColumn = 1
         };
-
-    private:
-#if (QT_VERSION < QT_VERSION_CHECK(4, 5, 0))
-        bool m_emitDataChanged;
-#endif
 };
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]