diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index 4963200ab..e07e39c79 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -26,7 +26,6 @@
 #include <QtGui/QPainter>
 #include <QtGui/QStandardItem>
 #include <QtCore/QTextCodec>
-#include <QtGui/QTextEdit>
 #include <QtGui/QLinearGradient>
 #include <QtGui/QRadialGradient>
 
@@ -42,6 +41,7 @@
 #include <KFileDialog>
 #include <KUrlCompletion>
 #include <KWindowSystem>
+#include <KTextEdit>
 
 // Konsole
 #include "ColorScheme.h"
@@ -279,7 +279,7 @@ void EditProfileDialog::showEnvironmentEditor()
     const Profile::Ptr info = lookupProfile();
 
     KDialog* dialog = new KDialog(this);
-    QTextEdit* edit = new QTextEdit(dialog);
+    KTextEdit* edit = new KTextEdit(dialog);
 
     QStringList currentEnvironment = info->property<QStringList>(Profile::Environment);
 
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index cdfc8761b..482639ff9 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -954,7 +954,7 @@ void TerminalDisplay::updateImage()
   // which therefore need to be repainted
   int dirtyLineCount = 0;
 
-  for (y = 0; y < linesToUpdate; y++)
+  for (y = 0; y < linesToUpdate; ++y)
   {
     const Character*       currentLine = &_image[y*this->_columns];
     const Character* const newLine = &newimg[y*columns];
@@ -966,7 +966,7 @@ void TerminalDisplay::updateImage()
     // its cell boundaries
     memset(dirtyMask, 0, columnsToUpdate+2);
    
-    for( x = 0 ; x < columnsToUpdate ; x++)
+    for( x = 0 ; x < columnsToUpdate ; ++x)
     {
         if ( newLine[x] != currentLine[x] ) 
         {
@@ -975,7 +975,7 @@ void TerminalDisplay::updateImage()
     }
 
     if (!_resizing) // not while _resizing, we're expecting a paintEvent
-    for (x = 0; x < columnsToUpdate; x++)
+    for (x = 0; x < columnsToUpdate; ++x)
     {
       _hasBlinker |= (newLine[x].rendition & RE_BLINK);
     
@@ -995,7 +995,7 @@ void TerminalDisplay::updateImage()
         _clipboard = newLine[x].backgroundColor;
         if (newLine[x].foregroundColor != cf) cf = newLine[x].foregroundColor;
         int lln = columnsToUpdate - x;
-        for (len = 1; len < lln; len++)
+        for (len = 1; len < lln; ++len)
         {
             const Character& ch = newLine[x+len];
 
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index 3d8e5e528..849a9ae62 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -220,22 +220,22 @@ void Vt102Emulation::initTokenizer()
 { 
   int i; 
   quint8* s;
-  for(i = 0;i < 256; i++) 
+  for(i = 0;i < 256; ++i) 
     charClass[i] = 0;
-  for(i = 0;i < 32; i++) 
+  for(i = 0;i < 32; ++i) 
     charClass[i] |= CTL;
-  for(i = 32;i < 256; i++) 
+  for(i = 32;i < 256; ++i) 
     charClass[i] |= CHR;
-  for(s = (quint8*)"@ABCDGHILMPSTXZcdfry"; *s; s++) 
+  for(s = (quint8*)"@ABCDGHILMPSTXZcdfry"; *s; ++s) 
     charClass[*s] |= CPN;
   // resize = \e[8;<row>;<col>t
-  for(s = (quint8*)"t"; *s; s++) 
+  for(s = (quint8*)"t"; *s; ++s) 
     charClass[*s] |= CPS;
-  for(s = (quint8*)"0123456789"; *s; s++) 
+  for(s = (quint8*)"0123456789"; *s; ++s) 
     charClass[*s] |= DIG;
-  for(s = (quint8*)"()+*%"; *s; s++) 
+  for(s = (quint8*)"()+*%"; *s; ++s) 
     charClass[*s] |= SCS;
-  for(s = (quint8*)"()+*#[]%"; *s; s++) 
+  for(s = (quint8*)"()+*#[]%"; *s; ++s) 
     charClass[*s] |= GRP;
 
   resetTokenizer();
diff --git a/src/ZModemDialog.cpp b/src/ZModemDialog.cpp
index 7fdb94bce..a2c5eea5d 100644
--- a/src/ZModemDialog.cpp
+++ b/src/ZModemDialog.cpp
@@ -19,11 +19,9 @@
 // Own 
 #include "ZModemDialog.h"
 
-// Qt
-#include <QtGui/QTextEdit>
-
 // KDE
 #include <KLocale>
+#include <KTextEdit>
 
 using namespace Konsole;
 
@@ -41,7 +39,7 @@ ZModemDialog::ZModemDialog(QWidget *parent, bool modal, const QString &caption)
 
   showButtonSeparator( true );
   enableButton(Close, false);
-  _textEdit = new QTextEdit(this);
+  _textEdit = new KTextEdit(this);
   _textEdit->setMinimumSize(400, 100);
   _textEdit->setReadOnly(true);
   setMainWidget(_textEdit);
diff --git a/src/ZModemDialog.h b/src/ZModemDialog.h
index 4c9877707..984dbe54d 100644
--- a/src/ZModemDialog.h
+++ b/src/ZModemDialog.h
@@ -21,7 +21,7 @@
 
 #include <kdialog.h>
 
-class QTextEdit;
+class KTextEdit;
 
 namespace Konsole
 {
@@ -46,7 +46,7 @@ public Q_SLOTS:
   void slotClose();
   
 private:
-  QTextEdit* _textEdit;
+  KTextEdit* _textEdit;
 };
 
 }