Merge latest version of KBarCode with the TDE sources

This relates to Bug 2095
Note that a handful of translation strings did not merge properly

1 files changed, 6 insertions, 6 deletions

diff --git a/kbarcode/dstextedit.h b/kbarcode/dstextedit.h
index 0e4b1dd..75a0903 100644
--- a/kbarcode/dstextedit.h
+++ b/kbarcode/dstextedit.h
@@ -18,26 +18,26 @@
 #ifndef _DS_TEXT_EDIT_H_
 #define _DS_TEXT_EDIT_H_
 
-#include <tqnamespace.h> 
+#include <tqnamespace.h>
 
 #include <ktextedit.h>
 
 // Otherwise moc will complain
 #define TextEditBase KTextEdit
 
-class DSTextEdit : public TextEditBase {
+class DSTextEdit : public KTextEdit {
     Q_OBJECT
-  
-        
+
+
   public:
     DSTextEdit( TQWidget* parent, const char* name = 0 );
 
     //virtual void moveCursor( CursorAction action, bool select );
   private slots:
     void fixParagraphs();
-      
+
   private:
-    /** 
+    /**
      * returns true if the cursor is currently inside
      * of a token of the form [value].
      */