Changeset 6033

Timestamp:

01/13/08 18:50:45 (10 months ago)

Author:

eugene

Message:

Replicated r6031.

Location:

trunk/qt-gui/src

Files:

• usereventdlg.cpp (modified) (2 diffs)
• usereventdlg.h (modified) (2 diffs)

trunk/qt-gui/src/usereventdlg.cpp

@@ -105 +105 @@
 
 const size_t SHOW_RECENT_NUM = 5;
+
+typedef pair<CUserEvent *, char *> MessageIter;
+
+bool OrderMessages(const MessageIter& m1, const MessageIter& m2)
+{
+  return (m1.first->Time() < m2.first->Time());
+}
 
 // -----------------------------------------------------------------------------
@@ -1698 +1705 @@
 
       // Sort the messages by time
-      sort(m_vMsgs.begin(), m_vMsgs.end(), OrderMessages());
+      stable_sort(m_vMsgs.begin(), m_vMsgs.end(), OrderMessages);
     
       // Now, finally add them

trunk/qt-gui/src/usereventdlg.h

@@ -30 +30 @@
 #include <utility>
 
-using std::binary_function;
 using std::list;
-using std::pair;
-using std::string;
 
 #include "licq_color.h"
@@ -76 +73 @@
 
 /* ----------------------------------------------------------------------------- */
-typedef pair<CUserEvent *, char *> MessageIter;
-
-struct OrderMessages : public binary_function<const MessageIter &, const MessageIter &, bool>
-{
-  bool operator()(const MessageIter& m1, const MessageIter& m2)
-  {
-    return (m1.first->Time() < m2.first->Time());
-  }
-};
-
-/* ----------------------------------------------------------------------------- */
 class UserEventTabDlg : public QWidget
 {