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

Timestamp:

03/22/08 05:06:28 (9 months ago)

Author:

flynd

Message:

Let KTextEdit handle context menu in kde4-gui so it can add spell checking entries. Also added spell checking to settings dialog.

Location:

trunk/qt4-gui/src/widgets

Files:

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

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

@@ -83 +83 @@
 
   setPalette(pal);
-}
-
-void MLEdit::setCheckSpellingEnabled(bool check)
-{
-#ifdef MLEDIT_USE_KTEXTEDIT
-  KTextEdit::setCheckSpellingEnabled(check);
-#else
-  (void) check; // Remove warning about unused parameter
-#endif
-}
-
-bool MLEdit::checkSpellingEnabled() const
-{
-#ifdef MLEDIT_USE_KTEXTEDIT
-  return KTextEdit::checkSpellingEnabled();
-#else
-  return false;
-#endif
 }
 
@@ -207 +189 @@
 }
 
+#ifndef USE_KDE
 void MLEdit::contextMenuEvent(QContextMenuEvent* event)
 {
@@ -223 +206 @@
   delete menu;
 }
+#endif
 
 void MLEdit::updateFont()

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

@@ -64 +64 @@
   void setForeground(const QColor& color);
 
-  void setCheckSpellingEnabled(bool check);
-  bool checkSpellingEnabled() const;
+#ifndef USE_KDE
+  void setCheckSpellingEnabled(bool /* check */) {}
+  bool checkSpellingEnabled() const { return false; }
+#endif
 
   /**
@@ -102 +104 @@
   virtual void keyPressEvent(QKeyEvent* event);
   virtual void mousePressEvent(QMouseEvent* event);
+#ifndef USE_KDE
   virtual void contextMenuEvent(QContextMenuEvent* event);
+#endif
 
 #if 0