[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-26 15:59:37
[Download RAW message or body]

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

Modified Files:
	mledit.h mlview2.h 
Log Message:
Revert


Index: mledit.h
===================================================================
RCS file: /cvsroot/licq/qt-gui/src/mledit.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mledit.h	25 Jan 2003 18:58:59 -0000	1.23
+++ mledit.h	26 Jan 2003 15:59:35 -0000	1.24
@@ -14,10 +14,8 @@
   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&);
@@ -30,11 +28,6 @@
   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();

Index: mlview2.h
===================================================================
RCS file: /cvsroot/licq/qt-gui/src/mlview2.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mlview2.h	25 Jan 2003 18:58:59 -0000	1.4
+++ mlview2.h	26 Jan 2003 15:59:35 -0000	1.5
@@ -17,6 +17,9 @@
   void setBackground(const QColor&);
   void setForeground(const QColor&);
 
+  using QMultiLineEdit::hasMarkedText;
+  using QMultiLineEdit::markedText;
+
   // Determines whether "quoted" (begining with ">") lines should be
   // specially formatted.
   void setFormatQuoted(bool enable);
@@ -24,9 +27,6 @@
 protected:
   virtual void setCellWidth ( int );
   virtual void paintCell(QPainter *p, int row, int col);
-
-  using QMultiLineEdit::hasMarkedText;
-  using QMultiLineEdit::markedText;
 
 private:
   bool m_bFormatQuoted;



-------------------------------------------------------
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]