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

List:       licq-cvs
Subject:    [Licq-cvs] qt-gui/src
From:       Jon Keating <emostar () users ! sourceforge ! net>
Date:       2003-01-25 18:59:02
[Download RAW message or body]

Update of /cvsroot/licq/qt-gui/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27209

Modified Files:
	mlview2.h mledit.h 
Log Message:
Qt2 compat fixes


Index: mlview2.h
===================================================================
RCS file: /cvsroot/licq/qt-gui/src/mlview2.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mlview2.h	23 Aug 2002 05:24:40 -0000	1.3
+++ mlview2.h	25 Jan 2003 18:58:59 -0000	1.4
@@ -14,9 +14,6 @@
   void append(const QString& s);
   void GotoEnd();
 
-  using QMultiLineEdit::hasMarkedText;
-  using QMultiLineEdit::markedText;
-
   void setBackground(const QColor&);
   void setForeground(const QColor&);
 
@@ -27,6 +24,9 @@
 protected:
   virtual void setCellWidth ( int );
   virtual void paintCell(QPainter *p, int row, int col);
+
+  using QMultiLineEdit::hasMarkedText;
+  using QMultiLineEdit::markedText;
 
 private:
   bool m_bFormatQuoted;

Index: mledit.h
===================================================================
RCS file: /cvsroot/licq/qt-gui/src/mledit.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mledit.h	20 Aug 2002 23:53:36 -0000	1.22
+++ mledit.h	25 Jan 2003 18:58:59 -0000	1.23
@@ -14,8 +14,10 @@
   void append(const QString& s);
   void GotoEnd();
 
+#if QT_VERSION >= 300
   using QMultiLineEdit::hasMarkedText;
   using QMultiLineEdit::markedText;
+#endif
 
   void setBackground(const QColor&);
   void setForeground(const QColor&);
@@ -28,6 +30,11 @@
   virtual void keyPressEvent( QKeyEvent * );
   virtual void setCellWidth ( int );
   bool focusNextPrevChild( bool n);
+
+#if QT_VERSION < 300
+  using QMultiLineEdit::hasMarkedText;
+  using QMultiLineEdit::markedText;
+#endif
 
 signals:
   void signal_CtrlEnterPressed();



-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
Licq-cvs mailing list
Licq-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/licq-cvs
[prev in list] [next in list] [prev in thread] [next in thread]