* More TQt/Qt4 features

* Various compilation fixes for Slackware


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1170159 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 98 insertions, 0 deletions

diff --git a/qtinterface/tqpair.h b/qtinterface/tqpair.h
index 883fa3f..db3ec73 100644
--- a/qtinterface/tqpair.h
+++ b/qtinterface/tqpair.h
@@ -40,6 +40,104 @@ Boston, MA 02110-1301, USA.
 
 #include <Qt/qpair.h>
 
+/****************************************************************************
+**
+** Definition of TQPair class
+**
+**
+** Copyright (C) 1992-2005 Trolltech AS.  All rights reserved.
+**
+** This file is part of the tools module of the Qt GUI Toolkit.
+**
+** This file may be distributed under the terms of the Q Public License
+** as defined by Trolltech AS of Norway and appearing in the file
+** LICENSE.QPL included in the packaging of this file.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+template <class T1, class T2>
+struct TQPair
+{
+    typedef T1 first_type;
+    typedef T2 second_type;
+
+    TQPair()
+	: first( T1() ), second( T2() )
+    {}
+    TQPair( const T1& t1, const T2& t2 )
+	: first( t1 ), second( t2 )
+    {}
+
+    TQPair<T1, T2>& operator=(const TQPair<T1, T2>& other)
+    {
+	if (this != &other) {
+	    first = other.first;
+	    second = other.second;
+	}
+	return *this;
+    }
+
+    T1 first;
+    T2 second;
+};
+
+template <class T1, class T2>
+bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
+{
+    return x.first == y.first && x.second == y.second;
+}
+
+template <class T1, class T2>
+bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
+{
+    return x.first < y.first ||
+	   ( !( y.first < x.first ) && x.second < y.second );
+}
+
+template <class T1, class T2>
+TQPair<T1, T2> qMakePair( const T1& x, const T2& y )
+{
+    return TQPair<T1, T2>( x, y );
+}
+
+#ifndef QT_NO_DATASTREAM
+template <class T1, class T2>
+inline QDataStream& operator>>( QDataStream& s, TQPair<T1, T2>& p )
+{
+    s >> p.first >> p.second;
+    return s;
+}
+
+template <class T1, class T2>
+inline QDataStream& operator<<( QDataStream& s, const TQPair<T1, T2>& p )
+{
+    s << p.first << p.second;
+    return s;
+}
+#endif
+
+/**********************************************************************/
+
 #endif // USE_QT4
 
 #endif /* TQPAIR_H */
\ No newline at end of file