Changeset 6111 for trunk/qt4-gui/src/widgets

Timestamp:

03/22/08 05:17:27 (9 months ago)

Author:

flynd

Message:

Use same type of defines for base class as used for tab widget.

Location:

trunk/qt4-gui/src/widgets

Files:

• mledit.cpp (modified) (5 diffs)
• mledit.h (modified) (2 diffs)

trunk/qt4-gui/src/widgets/mledit.cpp

@@ -33 +33 @@
 
 MLEdit::MLEdit(bool wordWrap, QWidget* parent, bool /* doQuotes */, const char* name)
-  : BaseClass(parent),
+  : MLEDIT_BASE(parent),
     myFixSetTextNewlines(true),
     myLastKeyWasReturn(false),
@@ -139 +139 @@
         break;
       default:
-        BaseClass::keyPressEvent(event);
+        MLEDIT_BASE::keyPressEvent(event);
         break;
     }
@@ -180 +180 @@
   }
 
-  BaseClass::keyPressEvent(event);
+  MLEDIT_BASE::keyPressEvent(event);
 }
 
@@ -186 +186 @@
 {
   emit clicked();
-  BaseClass::mousePressEvent(event);
+  MLEDIT_BASE::mousePressEvent(event);
 }
 
@@ -233 +233 @@
 QSize MLEdit::sizeHint() const
 {
-  QSize s = BaseClass::sizeHint();
+  QSize s = MLEDIT_BASE::sizeHint();
   if (myLinesHint > 0)
     s.setHeight(heightForLines(myLinesHint));

trunk/qt4-gui/src/widgets/mledit.h

@@ -25 +25 @@
 
 #ifdef USE_KDE
-# include <kdeversion.h>
-#  define MLEDIT_USE_KTEXTEDIT 1
-#endif
-
-#ifdef MLEDIT_USE_KTEXTEDIT
-# include <ktextedit.h>
+# include <KDE/KTextEdit>
+# define MLEDIT_BASE KTextEdit
 #else
 # include <QTextEdit>
+# define MLEDIT_BASE QTextEdit
 #endif
 
@@ -39 +36 @@
 {
 
-class MLEdit
-#ifdef MLEDIT_USE_KTEXTEDIT
-  : public KTextEdit
-#else
-  : public QTextEdit
-#endif
+class MLEdit : public MLEDIT_BASE
 {
   Q_OBJECT
-
-#ifdef MLEDIT_USE_KTEXTEDIT
-  typedef KTextEdit BaseClass;
-#else
-  typedef QTextEdit BaseClass;
-#endif
 
 public: