Changeset 6031

Timestamp:

01/13/08 02:17:31 (10 months ago)

Author:

eugene

Message:

Switched to stable sorting of messages vector and simplified the source a bit.

Files:

• branches/qt-gui_qt4/src/userevents/usersendcommon.cpp (modified) (3 diffs)

branches/qt-gui_qt4/src/userevents/usersendcommon.cpp

@@ -81 +81 @@
 using std::pair;
 using std::make_pair;
-using std::binary_function;
 using namespace LicqQtGui;
 /* TRANSLATOR LicqQtGui::UserSendCommon */
@@ -89 +88 @@
 typedef pair<CUserEvent*, char*> messagePair;
 
-struct orderMessagePairs
-  : public binary_function<const messagePair&, const messagePair&, bool>
-{
-  bool operator()(const messagePair& mp1, const messagePair& mp2)
-  {
-    return (mp1.first->Time() <= mp2.first->Time());
-  }
-};
+bool orderMessagePairs(const messagePair& mp1, const messagePair& mp2)
+{
+  return (mp1.first->Time() < mp2.first->Time());
+}
 
 UserSendCommon::UserSendCommon(int type, QString id, unsigned long ppid, QWidget* parent, const char* name)
@@ -365 +360 @@
 
       // Sort the messages by time
-      sort(messages.begin(), messages.end(), orderMessagePairs());
+      stable_sort(messages.begin(), messages.end(), orderMessagePairs);
 
       // Now, finally add them