Fix incorrectly renamed strings

(cherry picked from commit f9f32cc93e35d51abba0fb9f26afc211c60a5ea4)

37 files changed, 302 insertions, 302 deletions

diff --git a/chalk/colorspaces/wet/kis_texture_painter.cc b/chalk/colorspaces/wet/kis_texture_painter.cc
index 4b11b989..9300e808 100644
--- a/chalk/colorspaces/wet/kis_texture_painter.cc
+++ b/chalk/colorspaces/wet/kis_texture_painter.cc
@@ -85,7 +85,7 @@ void KisTexturePainter::createTexture( TQ_INT32 x,  TQ_INT32 y,  TQ_INT32 w,  TQ
         }
     }
 
-    //Qt::Vertical blurring was commented out in wetdreams, the effect seems to be achievable
+    // Vertical blurring was commented out in wetdreams, the effect seems to be achievable
     // without this.
     // I think this is because with blur in one direction, you get more the effect of
     // having 'fibers' in your paper
diff --git a/chalk/core/kis_boundary.cc b/chalk/core/kis_boundary.cc
index 0c9681c2..a15697a7 100644
--- a/chalk/core/kis_boundary.cc
+++ b/chalk/core/kis_boundary.cc
@@ -38,7 +38,7 @@ void KisBoundary::generateBoundary(int w, int h) {
 
     KisColorSpace* cs = m_device->colorSpace();
 
-    //Qt::Horizontal
+    // Horizontal
     for (int currentY = - 1; currentY < h; currentY++) {
         KisHLineIteratorPixel topIt = m_device->createHLineIterator(0, currentY, w, false);
         KisHLineIteratorPixel botIt = m_device->createHLineIterator(0, currentY + 1, w, false);
@@ -59,7 +59,7 @@ void KisBoundary::generateBoundary(int w, int h) {
         }
     }
 
-    //Qt::Vertical
+    // Vertical
     for (int currentX = - 1; currentX < w; currentX++) {
         KisVLineIteratorPixel leftIt = m_device->createVLineIterator(currentX, 0, h, false);
         KisVLineIteratorPixel rightIt = m_device->createVLineIterator(currentX + 1, 0, h, false);
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
index 4ce104f7..8f108565 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
@@ -121,20 +121,20 @@ KisEmbossInAllDirectionsFilter::KisEmbossInAllDirectionsFilter()
 }
 
 KisEmbossHorizontalVerticalFilter::KisEmbossHorizontalVerticalFilter()
-    : KisConvolutionConstFilter(id(), "emboss", i18n("EmbossQt::Horizontal &&Qt::Vertical"))
+    : KisConvolutionConstFilter(id(), "emboss", i18n("Emboss Horizontal &&Qt::Vertical"))
 {
     m_matrix = createKernel( 0, -1, 0 , -1, 4, -1 , 0, -1, 0, 1, 127);
     m_channelFlags = KisChannelInfo::FLAG_COLOR;
 }
 
 KisEmbossVerticalFilter::KisEmbossVerticalFilter()
-    : KisConvolutionConstFilter(id(), "emboss", i18n("EmbossQt::Vertical Only"))
+    : KisConvolutionConstFilter(id(), "emboss", i18n("Emboss Vertical Only"))
 {
     m_matrix = createKernel( 0, -1, 0 , 0, 2, 0 , 0, -1, 0, 1, 127);
 }
 
 KisEmbossHorizontalFilter::KisEmbossHorizontalFilter() :
-    KisConvolutionConstFilter(id(), "emboss", i18n("EmbossQt::Horizontal Only"))
+    KisConvolutionConstFilter(id(), "emboss", i18n("Emboss Horizontal Only"))
 {
     m_matrix = createKernel( 0, 0, 0 , -1, 4, -1 , 0, 0, 0, 1, 127);
 
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h
index 6c92888a..3a60adf7 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h
@@ -73,7 +73,7 @@ class KisEmbossHorizontalVerticalFilter : public KisConvolutionConstFilter {
 public:
     KisEmbossHorizontalVerticalFilter();
 public:
-    static inline KisID id() { return KisID("", i18n("EmbossQt::Horizontal &Qt::Vertical")); };
+    static inline KisID id() { return KisID("", i18n("Emboss Horizontal &Vertical")); };
     virtual bool supportsPainting() { return false; }
 
 };
@@ -82,7 +82,7 @@ class KisEmbossVerticalFilter : public KisConvolutionConstFilter {
 public:
     KisEmbossVerticalFilter();
 public:
-    static inline KisID id() { return KisID("emboss vertical only", i18n("EmbossQt::Vertical Only")); };
+    static inline KisID id() { return KisID("emboss vertical only", i18n("Emboss Vertical Only")); };
     virtual bool supportsPainting() { return false; }
 
 };
@@ -91,7 +91,7 @@ class KisEmbossHorizontalFilter : public KisConvolutionConstFilter {
 public:
     KisEmbossHorizontalFilter();
 public:
-    static inline KisID id() { return KisID("emboss horizontal only", i18n("EmbossQt::Horizontal Only")); };
+    static inline KisID id() { return KisID("emboss horizontal only", i18n("Emboss Horizontal Only")); };
     virtual bool supportsPainting() { return false; }
 
 };
diff --git a/chalk/ui/kis_boundary_painter.cc b/chalk/ui/kis_boundary_painter.cc
index b07bcb51..2b842e53 100644
--- a/chalk/ui/kis_boundary_painter.cc
+++ b/chalk/ui/kis_boundary_painter.cc
@@ -40,8 +40,8 @@ void KisBoundaryPainter::paint(const KisBoundary& boundary, KisCanvasPainter& pa
 {
     KisBoundary::PointPairListList::const_iterator it = boundary.m_horSegments.constBegin();
     KisBoundary::PointPairListList::const_iterator end = boundary.m_horSegments.constEnd();
-    
-    //Qt::Horizontal
+
+    // Horizontal
     while (it != end) {
         KisBoundary::PointPairList::const_iterator lineIt = (*it).constBegin();
         KisBoundary::PointPairList::const_iterator lineEnd = (*it).constEnd();
@@ -57,11 +57,11 @@ void KisBoundaryPainter::paint(const KisBoundary& boundary, KisCanvasPainter& pa
         }
         ++it;
     }
-    
-    //Qt::Vertical
+
+    // Vertical
     it = boundary.m_vertSegments.constBegin();
     end = boundary.m_vertSegments.constEnd();
-    
+
     while (it != end) {
         KisBoundary::PointPairList::const_iterator lineIt = (*it).constBegin();
         KisBoundary::PointPairList::const_iterator lineEnd = (*it).constEnd();
diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui
index 29038890..c1a48bd0 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -146,7 +146,7 @@
                             </item>
                             <item>
                                 <property name="text">
-                                    <string>Floating PointQt::Horizontal Differencing</string>
+                                    <string>Floating Point Horizontal Differencing</string>
                                 </property>
                             </item>
                             <property name="name">
diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc
index 4931b938..35445e18 100644
--- a/filters/karbon/msod/msod.cc
+++ b/filters/karbon/msod/msod.cc
@@ -153,8 +153,8 @@ void Msod::drawShape(
         "NOTCHEDRIGHTARROW",        // Notchedrightarrow
         "BLOCKARC",                 // Blockarc
         "SMILEYFACE",               // Smileyface
-        "VERTICALSCROLL",           //Qt::Verticalscroll
-        "HORIZONTALSCROLL",         //Qt::Horizontalscroll
+        "VERTICALSCROLL",           // Verticalscroll
+        "HORIZONTALSCROLL",         // Horizontalscroll
         "CIRCULARARROW",            // Circulararrow
         "NOTCHEDCIRCULARARROW",     // Notchedcirculararrow
         "UTURNARROW",               // Uturnarrow
diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h
index acb566a5..b36cb7ad 100644
--- a/filters/kspread/excel/sidewinder/format.h
+++ b/filters/kspread/excel/sidewinder/format.h
@@ -1,4 +1,4 @@
-/* Sidewinder - Portable library for spreadsheet 
+/* Sidewinder - Portable library for spreadsheet
    Copyright (C) 2003-2006 Ariya Hidayat <[email protected]>
    Copyright (C) 2006 Marijn Kruisselbrink <[email protected]>
 
@@ -6,7 +6,7 @@
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
-   
+
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -30,33 +30,33 @@ namespace Swinder
 /**
  * @short Provides color based on RGB values.
  *
- * Class Color provides color based on  terms of RGB (red, green and blue) 
+ * Class Color provides color based on  terms of RGB (red, green and blue)
  * components.
- * 
+ *
  */
 class Color
 {
 public:
 
   unsigned red, green, blue;
-  
+
   /**
    * Constructs a default color with the RGB value (0, 0, 0), i.e black.
-   */   
+   */
   Color(){ red = green = blue = 0; };
-  
+
   /**
    * Creates a copy of another color.
-   */   
+   */
   Color( const Color& c )
-    { red = c.red; green = c.green; blue = c.blue; }   
-  
+    { red = c.red; green = c.green; blue = c.blue; }
+
   /**
    * Creates a color based on given red, green and blue values.
-   */   
+   */
   Color( unsigned r, unsigned g, unsigned b )
     { red = r; green = g; blue = b; }
-  
+
   /**
    * Creates a color based on given red, green and blue values, encoded as #RRGGBB in a string.
    */
@@ -84,11 +84,11 @@ class Pen
 public:
 
   unsigned style;
-  
+
   unsigned width;
-  
+
   Color color;
-  
+
   enum {
     NoLine,         // no line at all
     SolidLine,      // a simple solid line
@@ -97,7 +97,7 @@ public:
     DashDotLine,    // alternate dots and dashes
     DashDotDotLine  // one dash, two dots, one dash, two dots
   };
-  
+
   Pen(): style( SolidLine ), width( 0 ){}
 
   friend inline bool operator==(const Pen&, const Pen&);
@@ -122,7 +122,7 @@ inline bool operator!=(const Pen& p1, const Pen& p2)
  *
  * Class FormatFont defines the font family, size and other attributes
  * for use in cell format.
- * 
+ *
  */
 
 class FormatFont
@@ -133,67 +133,67 @@ public:
    * Creates a default font information.
    */
   FormatFont();
-  
+
   /**
    * Destroys the font information
    */
   ~FormatFont();
-  
+
   /**
    * Creates a copy of font information.
    */
   FormatFont( const FormatFont& );
-  
+
   /**
    * Assigns from another font information.
    */
   FormatFont& operator=( const FormatFont& );
-  
+
   /**
    * Assigns from another font information.
    */
   FormatFont& assign( const FormatFont& );
-  
+
   /**
    * Returns true if it is a default font information.
    */
   bool isNull() const;
-  
+
   /**
    * Returns the name of font family, e.g "Helvetica".
    */
   const UString& fontFamily() const;
-  
+
   /**
    * Sets a new family for the font information.
    */
   void setFontFamily( const UString& fontFamily );
-  
+
   /**
    * Returns the size of font (in points).
    */
   double fontSize() const;
-  
+
   /**
    * Sets the size of font (in points).
    */
   void setFontSize( double fs );
-  
+
   /**
    * Returns the color of the font.
    */
   Color color() const;
-  
+
   /**
    * Sets the color of the font.
    */
   void setColor( const Color& color );
-  
+
   /**
    * Returns true if bold has been set.
    */
   bool bold() const;
-  
+
   /**
    * If b is true, bold is set on; otherwise bold is set off.
    */
@@ -203,52 +203,52 @@ public:
    * Returns true if italic has been set.
    */
   bool italic() const;
-  
+
   /**
    * If i is true, italic is set on; otherwise italic is set off.
    */
   void setItalic( bool i );
-  
+
   /**
    * Returns true if underline has been set.
    */
   bool underline() const;
-  
+
   /**
    * If u is true, underline is set on; otherwise underline is set off.
    */
   void setUnderline( bool u );
-  
+
   /**
    * Returns true if strikeout has been set.
    */
   bool strikeout() const;
-  
+
   /**
    * If s is true, strikeout is set on; otherwise strikeout is set off.
    */
   void setStrikeout( bool s );
-  
+
   /**
    * Returns true if subscript has been set.
    */
   bool subscript() const;
-  
+
   /**
    * If s is true, subscript is set on; otherwise subscript is set off.
    */
   void setSubscript( bool s );
-  
+
   /**
    * Returns true if superscript has been set.
    */
   bool superscript() const;
-  
+
   /**
    * If s is true, superscript is set on; otherwise superscript is set off.
    */
   void setSuperscript( bool s );
-  
+
   /**
    * Returns true if this font is equal to f; otherwise returns false.
    */
@@ -259,7 +259,7 @@ public:
    */
   bool operator!=(const FormatFont& f) const;
 
-private:  
+private:
   class Private;
   Private *d;
 };
@@ -270,7 +270,7 @@ private:
  *
  * Class FormatAlignment defines the horizontal and vertical alignment
  * for the text inside a cell.
- * 
+ *
  */
 
 class FormatAlignment
@@ -281,32 +281,32 @@ public:
    * Creates a default alignment information.
    */
   FormatAlignment();
-  
+
   /**
    * Destroys the alignment information
    */
   ~FormatAlignment();
-  
+
   /**
    * Creates a copy of alignment information.
    */
   FormatAlignment( const FormatAlignment& );
-  
+
   /**
    * Assigns from another alignment information.
    */
   FormatAlignment& operator=( const FormatAlignment& );
-  
+
   /**
    * Assigns from another alignment information.
    */
   FormatAlignment& assign( const FormatAlignment& );
-  
+
   /**
    * Returns true if it is a default alignment information.
    */
   bool isNull() const;
-  
+
   /**
    * Returns horizontal alignment. Possible values are
    * Format::Left, Format::Right and Format::Center.
@@ -314,71 +314,71 @@ public:
    * \sa setAlignX
    */
   unsigned alignX() const;
-  
+
   /**
    * Sets the horizontal alignment.
    *
    * \sa alignX
    */
   void setAlignX( unsigned xa );
-  
+
   /**
    * Returns horizontal alignment. Possible values are
    * Format::Top, Format::Middle and Format::Bottom.
    *
    * \sa setAlignY
-   */  
+   */
   unsigned alignY() const;
-  
+
   /**
    * Sets the horizontal alignment.
    *
    * \sa alignY
    */
    void setAlignY( unsigned xa );
-   
+
   /**
    * Returns true if the text should be wrapped at right border.
    *
    * \sa setWrap
-   */  
+   */
    bool wrap() const;
-   
+
   /**
    * Sets whether the text should be wrapped at right border.
    *
    * \sa setWrap
-   */  
+   */
    void setWrap( bool w );
-   
+
   /**
    * Returns the indentation level.
    *
    * \sa setIndentLevel
-   */  
+   */
    unsigned indentLevel() const;
-   
+
   /**
    * Sets the indentation level.
    *
    * \sa indentLevel
-   */  
+   */
    void setIndentLevel( unsigned i );
-   
+
   /**
    * Returns the text rotation angle.
    *
    * \sa setRotationAngle
-   */  
+   */
    unsigned rotationAngle() const;
-   
+
   /**
    * Sets the text rotation angle.
    *
    * \sa rotationAngle
-   */  
+   */
    void setRotationAngle( unsigned r );
-       
+
   /**
    * Returns true if this alignment is equal to f; otherwise returns false.
    */
@@ -389,14 +389,14 @@ public:
    */
   bool operator!=(const FormatAlignment& f) const;
 
-private:  
+private:
   class Private;
   Private *d;
 };
 
 /**
  * Defines background information for cell.
- * 
+ *
  */
 class FormatBackground
 {
@@ -405,32 +405,32 @@ public:
    * Creates a default background information.
    */
   FormatBackground();
-  
+
   /**
    * Destroys the background information.
    */
   ~FormatBackground();
-  
+
   /**
    * Creates a copy of background information.
    */
   FormatBackground( const FormatBackground& );
-  
+
   /**
    * Assigns from another background information.
    */
   FormatBackground& operator=( const FormatBackground& );
-  
+
   /**
    * Assigns from another background information.
    */
   FormatBackground& assign( const FormatBackground& );
-  
+
   /**
    * Returns true if it is a default background information.
    */
   bool isNull() const;
-  
+
   enum {
     SolidPattern,
     Dense1Pattern,
@@ -441,49 +441,49 @@ public:
     Dense6Pattern,
     Dense7Pattern,
     HorPattern,		// Horizonatal lines
-    VerPattern,		//Qt::Vertical lines
-    CrossPattern,	//Qt::Horizontal andQt::Vertical lines
+    VerPattern,		// Vertical lines
+    CrossPattern,	// Horizontal and vertical lines
     BDiagPattern,	// Left-bottom to right-top diagonal lines
     FDiagPattern,	// Left-top to right-bottom diagonal lines
     DiagCrossPattern,	// Crossing diagonal lines
     EmptyPattern
   };
-  
+
   /**
    * Returns pattern for this background.
    *
    * \sa setPattern
    */
   unsigned pattern() const;
-  
+
   /**
    * Set the pattern for this background.
    *
    * \sa pattern
    */
   void setPattern( unsigned );
-  
+
   /**
    * Returns the background color of the background area.
    *
    * \sa setBackgroundColor
    */
   Color backgroundColor() const;
-  
+
   /**
    * Set the background color.
    *
    * \sa backgroundColor
    */
   void setBackgroundColor( const Color& );
-  
+
   /**
    * Returns the foreground color of the background area.
    *
    * \sa setForegroundColor
    */
   Color foregroundColor() const;
-  
+
   /**
    * Sets the foreground color.
    *
@@ -500,7 +500,7 @@ public:
    * Returns true if this background is not equal to f; otherwise returns false.
    */
   bool operator!=(const FormatBackground& f) const;
-  
+
 private:
   class Private;
   Private *d;
@@ -508,7 +508,7 @@ private:
 
 /**
  * Defines borders information for cell.
- * 
+ *
  */
 
 class FormatBorders
@@ -519,81 +519,81 @@ public:
    * Creates a default border information.
    */
   FormatBorders();
-  
+
   /**
    * Destroys the border information
    */
   ~FormatBorders();
-  
+
   /**
    * Creates a copy of border information.
    */
   FormatBorders( const FormatBorders& );
-  
+
   /**
    * Assigns from another border information.
    */
   FormatBorders& operator=( const FormatBorders& );
-  
+
   /**
    * Assigns from another border information.
    */
   FormatBorders& assign( const FormatBorders& );
-  
+
   /**
    * Returns true if it is a default border information.
    */
   bool isNull() const;
-  
+
   /**
    * Returns pen style, width and color for left border.
    *
    * \sa setLeftBorder
    */
   const Pen& leftBorder() const;
-  
+
   /**
    * Sets pen style, width and color for left border.
    *
    * \sa leftBorder
    */
   void setLeftBorder( const Pen& pen );
-  
+
   /**
    * Returns pen style, width and color for right border.
    *
    * \sa setRightBorder
    */
   const Pen& rightBorder() const;
-  
+
   /**
    * Sets pen style, width and color for right border.
    *
    * \sa rightBorder
    */
   void setRightBorder( const Pen& pen );
-  
+
   /**
    * Returns pen style, width and color for top border.
    *
    * \sa setTopBorder
    */
   const Pen& topBorder() const;
-  
+
   /**
    * Sets pen style, width and color for top border.
    *
    * \sa topBorder
    */
   void setTopBorder( const Pen& pen );
-  
+
   /**
    * Returns pen style, width and color for bottom border.
    *
    * \sa setBottomBorder
    */
   const Pen& bottomBorder() const;
-  
+
   /**
    * Sets pen style, width and color for bottom border.
    *
@@ -610,11 +610,11 @@ public:
    * Returns true if this background is not equal to f; otherwise returns false.
    */
   bool operator!=(const FormatBorders& f) const;
-    
-private:  
+
+private:
   class Private;
   Private *d;
-};  
+};
 
 /**
  * Defines format of cell.
@@ -622,21 +622,21 @@ private:
  * Class Format defines possible formatting for use in cells or ranges.
  * Basically, Format might consist of one or more "pieces". Each piece
  * specifies only one type of formatting, e.g whether the text should
- * be shown in bold or not, which borders should the cells/ranges have, 
+ * be shown in bold or not, which borders should the cells/ranges have,
  * and so on.
  *
  * A complex formatting can be decomposed into different pieces. For example,
  * formatting like "Font is Arial 10 pt, background color is blue,
- " formula is hidden" could be a combination of three simple formatting pieces 
+ " formula is hidden" could be a combination of three simple formatting pieces
  * as: (1) font is "Arial 10pt", (2) background pattern is 100%, blue
  * and (3) cell is protected, formula is hidden. This also means
  * that one format might be applied to another format. An example of this is
  * "Font is Helvetica" format and "Left border, 1pt, blue" format will yields
- * something like "Font is Helvetica, with left border of blue 1pt". 
+ * something like "Font is Helvetica, with left border of blue 1pt".
  * Use Format::apply to do such format merging.
- * 
+ *
  */
- 
+
 
 class Format
 {
@@ -646,86 +646,86 @@ public:
    * Creates a default format.
    */
   Format();
-  
+
   /**
    * Destroys the format.
    */
   ~Format();
-  
-  /** 
+
+  /**
    * Creates a copy from another format.
    */
   Format( const Format& f );
 
-  /** 
+  /**
    * Assigns from another format.
    */
   Format& operator= ( const Format& f );
 
-  /** 
-   * Assigns from another value. 
+  /**
+   * Assigns from another value.
    */
   Format& assign( const Format& f );
-  
+
   /**
    * Returns true if it is a default format information.
    */
   bool isNull() const;
-  
-  /** 
+
+  /**
    * Returns a constant reference to the formatting information of this format.
    */
   FormatFont& font() const;
-  
-  /** 
+
+  /**
    * Sets new font information for this format.
    */
   void setFont( const FormatFont& font );
-  
-  /** 
+
+  /**
    * Returns a constant reference to the alignment information of this format.
    */
   FormatAlignment& alignment() const;
-  
-  /** 
+
+  /**
    * Sets new alignment information for this format.
    */
   void setAlignment( const FormatAlignment& alignment );
-  
-  /** 
+
+  /**
    * Returns a reference to the borders information of this format.
    */
   FormatBorders& borders() const;
-  
-  /** 
+
+  /**
    * Sets new borders information for this format.
    */
   void setBorders( const FormatBorders& border );
-  
+
   /**
    * Returns a reference to the background information of this format.
    */
   FormatBackground& background() const;
-  
+
   /**
    * Sets new background information for this format.
    */
   void setBackground( const FormatBackground& );
-  
+
   /**
    * Returns the formatting string to display the value of this format.
    */
   const UString& valueFormat() const;
-  
+
   /**
    * Sets the new formatting string to display the value of this format.
    */
-  void setValueFormat( const UString& valueFormat ); 
-  
+  void setValueFormat( const UString& valueFormat );
+
   enum { Left, Center, Right };
-  
+
   enum { Top, Middle, Bottom };
-  
+
   /**
    * Applies another format to this format. Basically this will merge
    * the formatting information of f into the current format.
diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd
index 7150f7e4..3ff04ff1 100644
--- a/filters/kspread/gnumeric/gnumeric.xsd
+++ b/filters/kspread/gnumeric/gnumeric.xsd
@@ -531,14 +531,14 @@
                   4 = 25%
                   5 = 12.5%
                   6 = 6.25%
-                  7 =Qt::Horizontal Stripe
-                  8 =Qt::Vertical Stripe
+                  7 = Horizontal Stripe
+                  8 = Vertical Stripe
                   9 = Reverse Diagonal Stripe
                  10 = Diagonal Stripe
                  11 = Diagonal Crosshatch
                  12 = Thick Diagonal Crosshatch
-                 13 = ThinQt::Horizontal Stripe
-                 14 = ThinQt::Vertical Stripe
+                 13 = Thin Horizontal Stripe
+                 14 = Thin Vertical Stripe
                  15 = Thin Reverse Diagonal Stripe
                  16 = Thin Diagonal Stripe
                  17 = Thin Crosshatch
diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc
index aa0d4337..f437aad0 100644
--- a/filters/kspread/gnumeric/gnumericimport.cc
+++ b/filters/kspread/gnumeric/gnumericimport.cc
@@ -1214,12 +1214,12 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table)
                         else if (shade == "7")
                         {
                             kspread_cell->format()->setBackGroundBrushStyle(Qt::HorPattern);
-                            /* 7Qt::Horizontal Stripe */
+                            /* 7 Horizontal Stripe */
                         }
                         else if (shade == "8")
                         {
                             kspread_cell->format()->setBackGroundBrushStyle(Qt::VerPattern);
-                            /* 8Qt::Vertical Stripe */
+                            /* 8 Vertical Stripe */
                         }
                         else if (shade == "9")
                         {
@@ -1243,7 +1243,7 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table)
                         }
                         else if (shade == "13")
                         {
-                            /* 13 ThinQt::Horizontal Stripe TODO: wrong: this is thick!*/
+                            /* 13 Thin Horizontal Stripe TODO: wrong: this is thick!*/
                             kspread_cell->format()->setBackGroundBrushStyle(Qt::HorPattern);
                         }
                         else if (shade == "14")
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 01b4813d..c64999e7 100644
--- a/filters/kword/msword/conversion.cpp
+++ b/filters/kword/msword/conversion.cpp
@@ -131,11 +131,11 @@ int Conversion::fillPatternStyle( int ipat )
     case 61: // 97.5 Percent
     case 62: // 97 Percent
         return TQt::Dense1Pattern;
-    case 14: // DarkQt::Horizontal
-    case 20: //Qt::Horizontal
+    case 14: // Dark Horizontal
+    case 20: // Horizontal
         return TQt::HorPattern;
-    case 15: // DarkQt::Vertical
-    case 21: //Qt::Vertical
+    case 15: // Dark Vertical
+    case 21: // Vertical
         return TQt::VerPattern;
     case 16: // Dark Forward Diagonal
     case 22: // Forward Diagonal
diff --git a/filters/olefilters/lib/filterbase.cc b/filters/olefilters/lib/filterbase.cc
index 523a0348..dbb7edd0 100644
--- a/filters/olefilters/lib/filterbase.cc
+++ b/filters/olefilters/lib/filterbase.cc
@@ -36,8 +36,8 @@ bool FilterBase::filter() {
 
     const unsigned height = 841; // Height.
     const unsigned width = 595;  // Width.
-    const unsigned hMargin = 28; //Qt::Horizontal margin.
-    const unsigned vMargin = 42; //Qt::Vertical margin.
+    const unsigned hMargin = 28; // Horizontal margin.
+    const unsigned vMargin = 42; // Vertical margin.
 
     newstr = TQString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE DOC >\n"
         "<DOC author=\"Reginald Stadlbauer and Torben Weis\" email=\"[email protected] and [email protected]\" editor=\"KWord\" mime=\"application/x-kword\">\n"
diff --git a/kchart/kdchart/KDChartBarPainter.cpp b/kchart/kdchart/KDChartBarPainter.cpp
index dbf6394a..f70e87e1 100644
--- a/kchart/kdchart/KDChartBarPainter.cpp
+++ b/kchart/kdchart/KDChartBarPainter.cpp
@@ -1636,7 +1636,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
                                             iDummy1, iDummy2, prevFrontX2 );
                     }// if( dataset >= datasetStart && dataset <= datasetEnd )
 
-                    //Qt::Vertical advancement in stacked or percent only if there was a value
+                    // Vertical advancement in stacked or percent only if there was a value
                     // Pending Michel add sideBarHeight in case we are in 3D mode but not for Percent
                     // where we need to display the top rect but cant resize the YAxis.
                     if ( params()->barChartSubType() == KDChartParams::BarStacked ||
diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp
index efc2362c..333b12e9 100644
--- a/kchart/kdchart/KDChartParams.cpp
+++ b/kchart/kdchart/KDChartParams.cpp
@@ -6675,7 +6675,7 @@ void KDChartParams::setBWChartPrintStatistics( BWStatVal statValue,
   prints the legend entries below each other, Qt::Horizontal prints them
   aside each other.
 
-  \noteQt::Horizontal orientation is only possible if the chart is NOT making
+  \note Horizontal orientation is only possible if the chart is NOT making
         room in horizontal direction, this means you may specify horizontal
         orientation if the legend position in one of the following values
         only: LegendTop, LegendBottom, LegendTopLeftTop, LegendTopRightTop,
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index a893eeb2..14967980 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -426,7 +426,7 @@ void KDGanttMinimizeSplitter::init()
   \brief the orientation of the splitter
 
   By default the orientation is horizontal (the widgets are side by side).
-  The possible orientations are TQt:Vertical and Qt::Horizontal (the default).
+  The possible orientations are Qt::Vertical and Qt::Horizontal (the default).
 */
 void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o )
 {
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 43413f85..3d3c8198 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -89,7 +89,7 @@ void KDTimeTableWidget::clearTaskLinks()
     while (it.current()) {
         delete it.current();
     }
-        
+
 }
 
 void KDTimeTableWidget::resetWidth( int wid )
@@ -620,7 +620,7 @@ void KDTimeTableWidget::updateMyContent()
             maximumComputedGridHeight = hei;
             // compute the background interval lines
             myGanttView->myTimeHeader->computeIntervals( hei );
-            //computeQt::VerticalGrid and column color
+            //compute VerticalGrid and column color
             computeVerticalGrid();
         }
     computeTaskLinks();
@@ -856,8 +856,8 @@ void KDTimeHeaderWidget::checkWidth( int wid )
          ( myMinimumWidth > mySizeHint &&
            myMinimumWidth < (width() - myGridMinorWidth  )) )
         computeTicks();
-    
-    // Update (horizontal) scrollbar, 
+
+    // Update (horizontal) scrollbar,
     // We probably come from an external resize and then we must
     // calculate on basis of myCanvasView.
     // (NOTE: we have disconnected the auto TQScrollView scrollbar update)
@@ -2377,7 +2377,7 @@ void KDTimeHeaderWidget::centerDateTime( const TQDateTime& center )
 {
      moveTimeLineTo(getCoordX( center )-(myGanttView->myCanvasView->viewport()->width() /2));
     //  tqDebug("centerDateTime %s %d %d", center.toString().latin1(),getCoordX( center ),(myGanttView->myCanvasView->viewport()->width() /2) );
-   
+
 }
 
 
@@ -2850,7 +2850,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
     for (; child; child = child->nextSibling()) {
         ypos = buildDrawables(drawables, level, ypos, child, cy, cy+ch);
     }
-    
+
     p->setFont( font() );
 
     TQPtrListIterator<KDListView::DrawableItem> it(drawables);
@@ -2935,7 +2935,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
 
         // do any children of current need to be painted?
 /* FIXME: painting branches doesn't work for some reason...
-        if ( ih != ith && 
+        if ( ih != ith &&
             rootIsDecorated() &&
             current->y + ith > cy &&
             current->y + ih < cy + ch &&
@@ -3221,7 +3221,7 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi
     onItem->setItemEnabled( 3, false );
     myMyContentsHeight = 0;
     _showItemAddPopupMenu = false;
-    
+
     TQObject *scrollViewTimer = child( "scrollview scrollbar timer", TQTIMER_OBJECT_NAME_STRING, false );
     Q_ASSERT( scrollViewTimer );
     if ( scrollViewTimer ) {
@@ -3229,7 +3229,7 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi
     }
     // If they needed a scrollbar timer in scrollview...
     connect( &scrollBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(myUpdateScrollBars() ) );
-    
+
     myScrollTimer = new TQTimer( this, "myScrollTimer" );
     connect( myScrollTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) );
     autoScrollEnabled = false;
@@ -3304,9 +3304,9 @@ void KDGanttCanvasView::setMyContentsHeight( int hei )
 // Then the new scrollbar maxValue is in myTimeHeader.
 void KDGanttCanvasView::updateHorScrollBar() {
     //tqDebug("horizontalScrollBar max=%d, myTimeHeaderScroll=%d", horizontalScrollBar()->maxValue(), mySignalSender->myTimeHeaderScroll->horizontalScrollBar()->value());
-    
+
     horizontalScrollBar()->setRange(mySignalSender->myTimeHeaderScroll->horizontalScrollBar()->minValue(), mySignalSender->myTimeHeaderScroll->horizontalScrollBar()->maxValue());
-    
+
 }
 
 void  KDGanttCanvasView::cutItem( KDGanttViewItem* item )
@@ -3537,7 +3537,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
                 currentItem = getItem(*it);
                 if (! currentItem->enabled() ) {
                     currentItem = 0;
-                } else if (linkItemsEnabled && 
+                } else if (linkItemsEnabled &&
                            !currentItem->isMyTextCanvas(*it)) {
                     fromArea = getItemArea(currentItem, e->pos().x());
                     if (fromArea > 0) {
@@ -3807,7 +3807,7 @@ KDGanttViewTaskLink*  KDGanttCanvasView::getLink(TQCanvasItem* it)
 }
 
 void KDGanttCanvasView::slotScrollTimer() {
-    int mx = mousePos.x(); 
+    int mx = mousePos.x();
     int my = mousePos.y();
     int dx = 0;
     int dy = 0;
@@ -3819,7 +3819,7 @@ void KDGanttCanvasView::slotScrollTimer() {
         dy = -5;
     else if (my > visibleHeight())
         dy = TQMIN(5, verticalScrollBar()->maxValue()-verticalScrollBar()->value());
-    
+
     if (dx != 0 || dy != 0)
         scrollBy(dx, dy);
 }
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 338cb08c..3e22fcdd 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -147,13 +147,13 @@ PropertyCommand::name() const
 void
 PropertyCommand::debug()
 {
-	kdDebug() << "PropertyCommand: name=\"" << name() << "\" widgets=" << m_oldvalues.keys() 
+	kdDebug() << "PropertyCommand: name=\"" << name() << "\" widgets=" << m_oldvalues.keys()
 		<< " value=" << m_value << " oldValues=" << m_oldvalues.values() << endl;
 }
 
 // GeometryPropertyCommand (for multiples widgets)
 
-GeometryPropertyCommand::GeometryPropertyCommand(WidgetPropertySet *set, 
+GeometryPropertyCommand::GeometryPropertyCommand(WidgetPropertySet *set,
 	const TQStringList &names, const TQPoint& oldPos)
  : Command(), m_propSet(set), m_names(names), m_oldPos(oldPos)
 {
@@ -215,7 +215,7 @@ GeometryPropertyCommand::name() const
 void
 GeometryPropertyCommand::debug()
 {
-	kdDebug() << "GeometryPropertyCommand: pos=" << m_pos << " oldPos=" << m_oldPos 
+	kdDebug() << "GeometryPropertyCommand: pos=" << m_pos << " oldPos=" << m_oldPos
 		<< " widgets=" << m_names << endl;
 }
 
@@ -367,7 +367,7 @@ AlignWidgetsCommand::name() const
 void
 AlignWidgetsCommand::debug()
 {
-	kdDebug() << "AlignWidgetsCommand: name=\"" << name() << "\" form=" << m_form->widget()->name() 
+	kdDebug() << "AlignWidgetsCommand: name=\"" << name() << "\" form=" << m_form->widget()->name()
 		<< " widgets=" << m_pos.keys() << endl;
 }
 
@@ -606,13 +606,13 @@ AdjustSizeCommand::name() const
 void
 AdjustSizeCommand::debug()
 {
-	kdDebug() << "AdjustSizeCommand: name=\"" << name() << "\" form=" << m_form->widget()->name() 
+	kdDebug() << "AdjustSizeCommand: name=\"" << name() << "\" form=" << m_form->widget()->name()
 		<< " widgets=" << m_sizes.keys() << endl;
 }
 
 // LayoutPropertyCommand
 
-LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname, 
+LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname,
 	const TQVariant &oldValue, const TQVariant &value)
  : PropertyCommand(buf, wname, oldValue, value, "layout")
 {
@@ -744,7 +744,7 @@ InsertWidgetCommand::execute()
 		kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl;
 		return;
 	}
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) 
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 //! @todo allow setting this for data view mode as well
 	if (m_form->designMode()) {
 		//don't generate accelerators for widgets in design mode
@@ -805,7 +805,7 @@ InsertWidgetCommand::execute()
 	m_container->reloadLayout(); // reload the layout to take the new wigdet into account
 
 	m_container->setSelectedWidget(w, false);
-	if (m_container->form()->library()->internalProperty(w->className(), 
+	if (m_container->form()->library()->internalProperty(w->className(),
 			"dontStartEditingOnInserting").isEmpty())
 	{
 		m_container->form()->library()->startEditing(
@@ -838,9 +838,9 @@ InsertWidgetCommand::name() const
 void
 InsertWidgetCommand::debug()
 {
-	kdDebug() << "InsertWidgetCommand: name=\"" << name() << "\" generatedName=" << m_name 
+	kdDebug() << "InsertWidgetCommand: name=\"" << name() << "\" generatedName=" << m_name
 		<< " container=" << m_containername
-		<< " form=" << m_form->widget()->name() << " class=" << m_class 
+		<< " form=" << m_form->widget()->name() << " class=" << m_class
 		<< " rect=" << m_insertRect << " pos=" << m_point << endl;
 }
 
@@ -897,7 +897,7 @@ CreateLayoutCommand::execute()
 		m_name = m_form->objectTree()->generateUniqueName(classname);
 
 	TQWidget *w = lib->createWidget(classname, container->widget(), m_name.latin1(), container);
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) 
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 //! @todo allow setting this for data view mode as well
 	if (w) {
 		if (m_form->designMode()) {
@@ -983,19 +983,19 @@ CreateLayoutCommand::name() const
 	switch(m_type)
 	{
 		case Container::HBox:
-			return i18n("Group WidgetsQt::Horizontally");
+			return i18n("Group Widgets Horizontally");
 		case Container::VBox:
-			return i18n("Group WidgetsQt::Vertically");
+			return i18n("Group Widgets Vertically");
 		case Container::Grid:
 			return i18n("Group Widgets in a Grid");
 		case Container::HSplitter:
-			return i18n("Group WidgetsQt::Horizontally in a Splitter");
+			return i18n("Group Widgets Horizontally in a Splitter");
 		case Container::VSplitter:
-			return i18n("Group WidgetsQt::Vertically in a Splitter");
+			return i18n("Group Widgets Vertically in a Splitter");
 		case Container::HFlow:
 			return i18n("Group Widgets By Rows");
 		case Container::VFlow:
-			return i18n("Group WidgetsQt::Vertically By Columns");
+			return i18n("Group Widgets Vertically By Columns");
 		default:
 			return i18n("Group widgets");
 	}
@@ -1004,7 +1004,7 @@ CreateLayoutCommand::name() const
 void
 CreateLayoutCommand::debug()
 {
-	kdDebug() << "CreateLayoutCommand: name=\"" << name() << "\" generatedName=" << m_name 
+	kdDebug() << "CreateLayoutCommand: name=\"" << name() << "\" generatedName=" << m_name
 		<< " widgets=" << m_pos.keys() << " container=" << m_containername
 		<< " form=" << m_form->widget()->name() << endl;
 }
@@ -1366,7 +1366,7 @@ PasteWidgetCommand::debug()
 {
 	kdDebug() << "PasteWidgetCommand: pos=" << m_point
 		<< " widgets=" << m_names << " container=" << m_containername
-		<< " form=" << m_form->widget()->name() 
+		<< " form=" << m_form->widget()->name()
 		<< " data=\"" << m_data.left(80) << "...\"" << endl;
 }
 
@@ -1588,7 +1588,7 @@ CommandGroup::debug()
 	kdDebug() << "*CommandGroup: name=\"" << name() << "\" #=" << m_subCommands->commands().count() << endl;
 	uint i = 1;
 	for (TQPtrListIterator<KCommand> it(m_subCommands->commands()); it.current(); ++it, i++) {
-		kdDebug() << "#" << i << ":" 
+		kdDebug() << "#" << i << ":"
 			<< (m_commandsShouldntBeExecuted[it.current()] ? "!" : "") << "allowExecute:" << endl;
 		if (dynamic_cast<Command*>(it.current()))
 			dynamic_cast<Command*>(it.current())->debug();
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 7be11444..ecb2e837 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -150,13 +150,13 @@ class KFORMEDITOR_EXPORT WidgetInfo
 
 		WidgetInfo* inheritedClass() const { return m_inheritedClass; }
 
-		/*! Sets custom type \a type for property \a propertyName. 
-		 This allows to override default type, especially when custom property 
+		/*! Sets custom type \a type for property \a propertyName.
+		 This allows to override default type, especially when custom property
 		 and custom property editor item has to be used. */
 		void setCustomTypeForProperty(const char *propertyName, int type);
 
 		/*! \return custom type for property \a propertyName. If no specific custom type has been assigned,
-		 KoProperty::Auto is returned. 
+		 KoProperty::Auto is returned.
 		 @see setCustomTypeForProperty() */
 		int customTypeForProperty(const char *propertyName) const;
 
@@ -195,7 +195,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
   You can use createMenuActions() to add custom items in widget's context menu. The previewWidget()
   is called when the Form gets in Preview mode, and you have a last opportunity to remove all editing-related
   stuff (see eg \ref Spring class).\n
-  You can also choose which properties to show in the Property Editor. 
+  You can also choose which properties to show in the Property Editor.
   By default, most all properties are shown (see implementation for details),
   but you can hide some reimplementing isPropertyVisibleInternal() (don't forget to call superclass' method)
   To add new properties, just define new TQ_PROPERTY in widget class definition.\n \n
@@ -236,15 +236,15 @@ class KFORMEDITOR_EXPORT WidgetInfo
   * "orientationSelectionPopup:verticalIcon" - the same for "Vertical" item.
     Set this property only for classes supporting orientations.
   * "orientationSelectionPopup:horizontalText" - sets a i18n'd text for "Horizontal" item
-    for objects of class 'ClassName', e.g. i18n("InsertQt::Horizontal Line").
+    for objects of class 'ClassName', e.g. i18n("Insert Horizontal Line").
     Set this property only for classes supporting orientations.
   * "orientationSelectionPopup:verticalText" - the same for "Vertical" item,
-    e.g. i18n("InsertQt::Vertical Line"). Set this property only for classes supporting orientations.
+    e.g. i18n("Insert Vertical Line"). Set this property only for classes supporting orientations.
   * "dontStartEditingOnInserting" - if not empty, WidgetFactory::startEditing() will not be executed upon
     widget inseting by a user.
-  * "forceShowAdvancedProperty:{propertyname}" - set it to "1" for "{propertyname}" advanced property 
-    if you want to force it to be visible even if WidgetLibrary::setAdvancedPropertiesVisible(false) 
-    has been called. For example, setting "forceShowAdvancedProperty:pixmap" to "1" 
+  * "forceShowAdvancedProperty:{propertyname}" - set it to "1" for "{propertyname}" advanced property
+    if you want to force it to be visible even if WidgetLibrary::setAdvancedPropertiesVisible(false)
+    has been called. For example, setting "forceShowAdvancedProperty:pixmap" to "1"
     unhides "pixmap" property for a given class.
 
   See StdWidgetFactory::StdWidgetFactory() for properties like
@@ -257,10 +257,10 @@ class KFORMEDITOR_EXPORT WidgetInfo
 class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 {
 	Q_OBJECT
-  
+
 	public:
 		//! Options used in createWidget()
-		enum CreateWidgetOptions { 
+		enum CreateWidgetOptions {
 			AnyOrientation = 1, //!< any orientation hint
 			HorizontalOrientation = 2,  //!< horizontal orientation hint
 			VerticalOrientation = 4, //!< vertical orientation hint
@@ -295,10 +295,10 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 * \param options options for the created widget: orientation and view mode (see CreateWidgetOptions)
 		 */
 		virtual TQWidget* createWidget(const TQCString &classname, TQWidget *parent, const char *name,
-			KFormDesigner::Container *container, 
+			KFormDesigner::Container *container,
 			int options = DefaultOptions) = 0;
 
-		/*! Creates custom actions. Reimplement this if you need to add some 
+		/*! Creates custom actions. Reimplement this if you need to add some
 		 actions coming from the factory. */
 		virtual void createCustomActions(TDEActionCollection *col) { Q_UNUSED(col); };
 
@@ -372,14 +372,14 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 
 	protected:
 		/*! This function is called when we want to know whether the property should be visible.
-		 Implement it in the factory; don't forget to call implementation in the superclass. 
+		 Implement it in the factory; don't forget to call implementation in the superclass.
 		 Default implementation hides "caption", "icon", "sizeIncrement" and "iconText" properties. */
 		virtual bool isPropertyVisibleInternal(const TQCString &classname, TQWidget *w,
 			const TQCString &property, bool isTopLevel);
 
 		/*! Sometimes property sets should be reloaded when a given property value changed.
 		 Implement it in the factory. Default implementation always returns false. */
-		virtual bool propertySetShouldBeReloadedAfterPropertyChange(const TQCString& classname, TQWidget *w, 
+		virtual bool propertySetShouldBeReloadedAfterPropertyChange(const TQCString& classname, TQWidget *w,
 			const TQCString& property);
 
 		/*! This function creates a KLineEdit to input some text and edit a widget's contents.
@@ -497,8 +497,8 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 		 It's value is inherited from WidgetLibrary. */
 		bool m_showAdvancedProperties;
 
-		/*! Contains name of an XMLGUI file providing toolbar buttons 
-		 (and menu items in the future?) for the factory. 
+		/*! Contains name of an XMLGUI file providing toolbar buttons
+		 (and menu items in the future?) for the factory.
 		 Can be empty, e.g. for the main factory which has XMLGUI defined in the shell window itself
 		 (e.g. kexiformpartinstui.rc for Kexi Forms). This name is set in WidgetLibrary::loadFactories() */
 		TQString m_xmlGUIFileName;
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index 23991774..f5da30e1 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -217,7 +217,7 @@ WidgetLibrary::lookupFactories()
 		}
 		const uint factoryVersion = ptr->property("X-KFormDesigner-WidgetFactoryVersion").toUInt();
 		if (KFormDesigner::version()!=factoryVersion) {
-			kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'" 
+			kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'"
 				" has version '%2' but required Widget Factory version is '%3'\n"
 				" -- skipping this factory!").arg(ptr->library()).arg(factoryVersion)
 				.arg(KFormDesigner::version()) << endl;
@@ -319,7 +319,7 @@ WidgetLibrary::createXML()
 }*/
 
 ActionList
-WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, 
+WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent,
 	TQObject *receiver, const char *slot)
 {
 	loadFactories();
@@ -338,8 +338,8 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *p
 	ActionList actions;
 	for (TQAsciiDictIterator<WidgetInfo> it(d->widgets); it.current(); ++it)
 	{
-		LibActionWidget *a = new LibActionWidget(it.current(), 
-			it.current()->factory()->m_guiClient 
+		LibActionWidget *a = new LibActionWidget(it.current(),
+			it.current()->factory()->m_guiClient
 			? it.current()->factory()->m_guiClient->actionCollection() : parent);
 		connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot);
 		actions.append(a);
@@ -353,7 +353,7 @@ WidgetLibrary::addCustomWidgetActions(TDEActionCollection *col)
 	for (TQAsciiDictIterator<WidgetFactory> it(d->factories); it.current(); ++it)
 	{
 		it.current()->createCustomActions(
-			it.current()->m_guiClient 
+			it.current()->m_guiClient
 			? it.current()->m_guiClient->actionCollection() : col);
 	}
 }
@@ -730,13 +730,13 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
 	if (textHorizontal.isEmpty() && wclass->inheritedClass())
 		iconName = wclass->inheritedClass()->factory()->internalProperty(classname, "orientationSelectionPopup:horizontalText");
 	if (textHorizontal.isEmpty()) //default
-		textHorizontal = i18n("InsertQt::Horizontal Widget", "InsertQt::Horizontal");
+		textHorizontal = i18n("Insert Horizontal Widget", "Insert Horizontal");
 
 	TQString textVertical = wclass->factory()->internalProperty(classname, "orientationSelectionPopup:verticalText");
 	if (textVertical.isEmpty() && wclass->inheritedClass())
 		iconName = wclass->inheritedClass()->factory()->internalProperty(classname, "orientationSelectionPopup:verticalText");
 	if (textVertical.isEmpty()) //default
-		textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical");
+		textVertical = i18n("Insert Vertical Widget", "Insert Vertical");
 
 	TDEPopupMenu* popup = new TDEPopupMenu(parent, "orientationSelectionPopup");
 	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name()));
diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h
index 76194d13..630b0307 100644
--- a/kexi/main/ksplitter.h
+++ b/kexi/main/ksplitter.h
@@ -47,13 +47,13 @@ class KDockWidget;
 class KDockSplitter : public TQWidget
 {
   //Q_OBJECT
-  
+
 public:
   /**
    * Constructor.
    * @param parent parent widget
    * @param name name
-   * @param orient orientation. Either @pQt::Vertical or @pQt::Horizontal
+   * @param orient orientation. Either @p Qt::Vertical or @p Qt::Horizontal
    * @param pos procentual position of the splitter. Must be int [0...100].
    */
   KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50);
@@ -77,7 +77,7 @@ public:
    * Return the separator position in percent (%), so the range is [0..100]
    * @return separator position in percent
    */
-  int separatorPosInPercent() 
+  int separatorPosInPercent()
 #if KDE_IS_VERSION(3,4,89)
 	;
 #else
@@ -169,7 +169,7 @@ public:
   void restoreFromForcedFixedSize(KDockWidget *dw);
 
   /**
-   * The orientation is either @pQt::Horizontal or @pQt::Vertical.
+   * The orientation is either @p Qt::Horizontal or @p Qt::Vertical.
    */
   Qt::Orientation orientation(){return m_orientation;}
 
@@ -235,7 +235,7 @@ private:
   TQFrame* divider;
   /**
    * @p xpos and @p savedXPos represent the current divider position.
-   * If the orientation isQt::Horizontal @p xpos actually is "ypos". So
+   * If the orientation is Qt::Horizontal @p xpos actually is "ypos". So
    * do not get confused only because of the 'x'.
    *
    * xpos and savedXPos are internally high resolution. So *not* 0..100%
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index c23398e0..7353f16f 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -37,7 +37,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 		 ie as it is stored in m_list. You must delete the list after using it. */
 		TQPtrList<TQWidget>* widgetList() const;
 
-		/*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */
+		/*! Sets layout's orientation to \a orientation. Default orientation is Qt::Vertical. */
 		void  setOrientation(Qt::Orientation orientation) { m_orientation = orientation; }
 
 		/*! \return layout's orientation. */
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index c34022d8..63326efc 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -1568,13 +1568,13 @@ void KivioView::setHParaAlign( int i )
     KivioStencil *pStencil = m_pActivePage->selectedStencils()->first();
     if (!pStencil)
       return;
-    KMacroCommand *macro = new KMacroCommand( i18n("Change StencilQt::Horizontal Alignment"));
+    KMacroCommand *macro = new KMacroCommand( i18n("Change Stencil Horizontal Alignment"));
     bool createMacro = false;
     while( pStencil )
     {
         if ( pStencil->hTextAlign() != i)
         {
-            KivioChangeStencilHAlignmentCommand * cmd = new KivioChangeStencilHAlignmentCommand( i18n("Change StencilQt::Horizontal Alignment"), m_pActivePage, pStencil, pStencil->hTextAlign(), i);
+            KivioChangeStencilHAlignmentCommand * cmd = new KivioChangeStencilHAlignmentCommand( i18n("Change Stencil Horizontal Alignment"), m_pActivePage, pStencil, pStencil->hTextAlign(), i);
 
             pStencil->setHTextAlign(i);
             macro->addCommand( cmd );
@@ -1596,13 +1596,13 @@ void KivioView::setVParaAlign( int i )
     KivioStencil *pStencil = m_pActivePage->selectedStencils()->first();
     if (!pStencil)
       return;
-    KMacroCommand *macro = new KMacroCommand( i18n("Change StencilQt::Vertical Alignment"));
+    KMacroCommand *macro = new KMacroCommand( i18n("Change Stencil Vertical Alignment"));
     bool createMacro = false;
     while( pStencil )
     {
         if ( pStencil->vTextAlign() != i )
         {
-            KivioChangeStencilVAlignmentCommand * cmd = new KivioChangeStencilVAlignmentCommand( i18n("Change StencilQt::Vertical Alignment"), m_pActivePage, pStencil, pStencil->vTextAlign(), i);
+            KivioChangeStencilVAlignmentCommand * cmd = new KivioChangeStencilVAlignmentCommand( i18n("Change Stencil Vertical Alignment"), m_pActivePage, pStencil, pStencil->vTextAlign(), i);
             pStencil->setVTextAlign( i );
             macro->addCommand( cmd );
             createMacro = true;
diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.h b/kivio/kiviopart/kiviosdk/kivio_shape_data.h
index bd89dcc8..9717cb27 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_data.h
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.h
@@ -40,7 +40,7 @@ public:
     TQColor m_textColor;                             // The text color
     TQFont m_textFont;                               // The text font
     bool m_isHtml;                                  // Is the text HTML formatted?
-    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text alignment flags
+    int m_hTextAlign, m_vTextAlign;                 // Horizontal and vertical text alignment flags
 };
 
 /**
diff --git a/kivio/kiviopart/kiviosdk/kivio_text_style.h b/kivio/kiviopart/kiviosdk/kivio_text_style.h
index 73c13e0e..339b6f29 100644
--- a/kivio/kiviopart/kiviosdk/kivio_text_style.h
+++ b/kivio/kiviopart/kiviosdk/kivio_text_style.h
@@ -18,7 +18,7 @@ protected:
     TQColor m_color;                                 // The text color
     TQFont m_font;                                   // The text font
     bool m_isHtml;                                  // Is the text HTML formatted?
-    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text alignment flags
+    int m_hTextAlign, m_vTextAlign;                 // Horizontal and vertical text alignment flags
 
 public:
     KivioTextStyle();
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
index 53708a64..575f5df5 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
@@ -59,7 +59,7 @@ StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *parent,
   menu = new TQPopupMenu(m_mainWidget->m_vAlignButton, "hAlignMenu");
   menu->setCheckable(true);
   menu->insertItem(SmallIconSet("align_top", 16), i18n("Align Top"), TQt::AlignTop);
-  menu->insertItem(SmallIconSet("align_vcenter", 16), i18n("AlignQt::Vertical Center"), TQt::AlignVCenter);
+  menu->insertItem(SmallIconSet("align_vcenter", 16), i18n("Align Vertical Center"), TQt::AlignVCenter);
   menu->insertItem(SmallIconSet("align_bottom", 16), i18n("Align Bottom"), TQt::AlignBottom);
   m_mainWidget->m_vAlignButton->setPopup(menu);
   connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setVerticalAlign(int)));
diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp
index bfc54a73..e8ebc0fa 100644
--- a/kivio/plugins/kiviotexttool/tool_text.cpp
+++ b/kivio/plugins/kiviotexttool/tool_text.cpp
@@ -169,7 +169,7 @@ void TextTool::mousePress( TQMouseEvent *e )
     int colType;
     KivioPage *page = view()->activePage();
     KivioStencil* stencil = page->checkForStencil( &pagePoint, &colType, 0.0, false);
-    
+
     if(stencil) {
       applyToolAction(stencil, pagePoint);
     } else if(startRubberBanding(e)) {
@@ -319,7 +319,7 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils)
 
       if(changeHAlignment && (stencil->hTextAlign() != halignment)) {
         KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand(
-            i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment);
+            i18n("Change Stencil Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment);
         stencil->setHTextAlign(halignment);
         macroCmd->addCommand(cmd);
         changed = true;
@@ -327,7 +327,7 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils)
 
       if(changeVAlignment && (stencil->vTextAlign() != valignment)) {
         KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand(
-            i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment);
+            i18n("Change Stencil Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment);
         stencil->setVTextAlign(valignment);
         macroCmd->addCommand(cmd);
         changed = true;
@@ -404,7 +404,7 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos)
 
     if(stencil->hTextAlign(name) != halignment) {
       KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand(
-          i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil,
+          i18n("Change Stencil Horizontal Alignment"), view()->activePage(), stencil,
           stencil->hTextAlign(name), halignment, name);
       stencil->setHTextAlign(name, halignment);
       macroCmd->addCommand(cmd);
@@ -415,7 +415,7 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos)
 
     if(stencil->vTextAlign(name) != valignment) {
       KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand(
-          i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil,
+          i18n("Change Stencil Vertical Alignment"), view()->activePage(), stencil,
       stencil->vTextAlign(name), valignment, name);
       stencil->setVTextAlign(name, valignment);
       macroCmd->addCommand(cmd);
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index fc57515d..43469219 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -2330,12 +2330,12 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con
     {
         o = it.toLast();
         while ( o ) {
-            if ( o != m_doc->footer() || 
-                 o != m_doc->header() || 
-                 ( m_bHasFooter && o == m_doc->footer() ) || 
+            if ( o != m_doc->footer() ||
+                 o != m_doc->header() ||
+                 ( m_bHasFooter && o == m_doc->footer() ) ||
                  ( m_bHasHeader && o == m_doc->header() ) )
             {
-                if ( ( o->isSelected() || i > 0 ) && 
+                if ( ( o->isSelected() || i > 0 ) &&
                        o->contains( pos ) && !( o->isProtect() && withoutProtected ) )
                     return o;
             }
@@ -2420,10 +2420,10 @@ KCommand *KPrPage::alignVertical(VerticalAlignmentType _type )
             KPrTextObject *obj = dynamic_cast<KPrTextObject *>(it.current());
             if ( obj  && !obj->isProtectContent())
             {
-                KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("ChangeQt::Vertical Alignment"),
+                KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("Change Vertical Alignment"),
                                                                                                  obj, obj->verticalAlignment(),_type, m_doc);
                 if ( !macro )
-                    macro = new KMacroCommand( i18n("ChangeQt::Vertical Alignment"));
+                    macro = new KMacroCommand( i18n("Change Vertical Alignment"));
                 macro->addCommand( cmd );
                 cmd->execute();
             }
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 51a4964e..d7d0b668 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -50,7 +50,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name
     int pgnum = m_view->getCurrPgNum() - 1;
     KPrPage *page = m_view->kPresenterDoc()->pageList().at( pgnum );
     m_effect = page->getPageEffect();
-    m_effectSpeed = page->getPageEffectSpeed();  
+    m_effectSpeed = page->getPageEffectSpeed();
     m_soundEffect = page->getPageSoundEffect();
     m_soundFileName = page->getPageSoundFileName();
     m_slideTime = page->getPageTimer();
@@ -81,20 +81,20 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name
 
     // fill effect combo
     m_dialog->effectCombo->insertItem( i18n( "No Effect" ) );
-    m_dialog->effectCombo->insertItem( i18n( "CloseQt::Horizontal" ) );
-    m_dialog->effectCombo->insertItem( i18n( "CloseQt::Vertical" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Close Horizontal" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Close Vertical" ) );
     m_dialog->effectCombo->insertItem( i18n( "Close From All Directions" ) );
-    m_dialog->effectCombo->insertItem( i18n( "OpenQt::Horizontal" ) );
-    m_dialog->effectCombo->insertItem( i18n( "OpenQt::Vertical" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Open Horizontal" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Open Vertical" ) );
     m_dialog->effectCombo->insertItem( i18n( "Open From All Directions" ) );
-    m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Horizontal 1" ) );
-    m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Horizontal 2" ) );
-    m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Vertical 1" ) );
-    m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Vertical 2" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Interlocking Horizontal 1" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Interlocking Horizontal 2" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Interlocking Vertical 1" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Interlocking Vertical 2" ) );
     m_dialog->effectCombo->insertItem( i18n( "Surround 1" ) );
     m_dialog->effectCombo->insertItem( i18n( "Fly Away 1" ) );
-    m_dialog->effectCombo->insertItem( i18n( "Blinds::Horizontal" ) );
-    m_dialog->effectCombo->insertItem( i18n( "Blinds::Vertical" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Blinds Horizontal" ) );
+    m_dialog->effectCombo->insertItem( i18n( "Blinds Vertical" ) );
     m_dialog->effectCombo->insertItem( i18n( "Box In" ) );
     m_dialog->effectCombo->insertItem( i18n( "Box Out" ) );
     m_dialog->effectCombo->insertItem( i18n( "Checkerboard Across" ) );
@@ -130,7 +130,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name
         m_dialog->effectCombo->setCurrentItem( m_dialog->effectCombo->count()-1 );
 
     connect( m_dialog->effectCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( effectChanged( int ) ) );
-    
+
     // setup speed combo
     m_dialog->speedCombo->insertItem( i18n("Slow") );
     m_dialog->speedCombo->insertItem( i18n("Medium") );
@@ -164,7 +164,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name
 
     connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) );
     connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotUser1() ) );
-    
+
     setMainWidget( m_dialog );
 }
 
@@ -188,7 +188,7 @@ void KPrSlideTransitionDia::preview()
         effect = PEF_RANDOM;
 
     EffectSpeed effectSpeed = static_cast<EffectSpeed>( m_dialog->speedCombo->currentItem() );
-  
+
     if ( m_pageEffect )
     {
         m_pageEffectTimer.stop();
@@ -330,7 +330,7 @@ void KPrSlideTransitionDia::apply( bool global )
     bool soundEffect = m_dialog->soundCheckBox->isChecked();
     TQString soundFileName = m_dialog->soundRequester->url();
     int slideTime = m_dialog->automaticTransitionInput->value();
-    
+
     if ( effect != m_effect ||
          effectSpeed != m_effectSpeed ||
          soundEffect != m_soundEffect ||
@@ -338,7 +338,7 @@ void KPrSlideTransitionDia::apply( bool global )
          slideTime != m_slideTime )
     {
         KPrTransEffectCmd::PageEffectSettings newSettings;
-    
+
         newSettings.pageEffect = effect;
         newSettings.effectSpeed = effectSpeed;
         newSettings.soundEffect = soundEffect;
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index b1118cd8..0a276a5a 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -185,20 +185,20 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
 
     effectList = new TQListBox( leftpart );
     effectList->insertItem( i18n( "No Effect" ) );
-    effectList->insertItem( i18n( "CloseQt::Horizontal" ) );
-    effectList->insertItem( i18n( "CloseQt::Vertical" ) );
+    effectList->insertItem( i18n( "Close Horizontal" ) );
+    effectList->insertItem( i18n( "Close Vertical" ) );
     effectList->insertItem( i18n( "Close From All Directions" ) );
-    effectList->insertItem( i18n( "OpenQt::Horizontal" ) );
-    effectList->insertItem( i18n( "OpenQt::Vertical" ) );
+    effectList->insertItem( i18n( "Open Horizontal" ) );
+    effectList->insertItem( i18n( "Open Vertical" ) );
     effectList->insertItem( i18n( "Open From All Directions" ) );
-    effectList->insertItem( i18n( "InterlockingQt::Horizontal 1" ) );
-    effectList->insertItem( i18n( "InterlockingQt::Horizontal 2" ) );
-    effectList->insertItem( i18n( "InterlockingQt::Vertical 1" ) );
-    effectList->insertItem( i18n( "InterlockingQt::Vertical 2" ) );
+    effectList->insertItem( i18n( "Interlocking Horizontal 1" ) );
+    effectList->insertItem( i18n( "Interlocking Horizontal 2" ) );
+    effectList->insertItem( i18n( "Interlocking Vertical 1" ) );
+    effectList->insertItem( i18n( "Interlocking Vertical 2" ) );
     effectList->insertItem( i18n( "Surround 1" ) );
     effectList->insertItem( i18n( "Fly Away 1" ) );
-    effectList->insertItem( i18n( "Blinds::Horizontal" ) );
-    effectList->insertItem( i18n( "Blinds::Vertical" ) );
+    effectList->insertItem( i18n( "Blinds Horizontal" ) );
+    effectList->insertItem( i18n( "Blinds Vertical" ) );
     effectList->insertItem( i18n( "Box In" ) );
     effectList->insertItem( i18n( "Box Out" ) );
     effectList->insertItem( i18n( "Checkerboard Across" ) );
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc
index 9c003498..ee241617 100644
--- a/kspread/dialogs/kspread_dlg_series.cc
+++ b/kspread/dialogs/kspread_dlg_series.cc
@@ -6,7 +6,7 @@
              (C) 2001-2002 Philipp Mueller <[email protected]>
              (C) 2000-2001 Werner Trobin <[email protected]>
              (C) 1998-2000 Torben Weis <[email protected]>
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
@@ -95,7 +95,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker)
 
   new TQLabel( i18n( "Step value:" ), params );
   step=new KDoubleNumInput(-999999.999, 999999.99, 0.0, 1.0, 3, params);
- 
+
   grid1->addWidget(gb);
 
   grid1->addWidget(gb1);
@@ -110,8 +110,8 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker)
 void SeriesDlg::slotOk()
 {
 
-  Series mode=Column;  //same asQt::Vertical
-  Series type=Linear;  // same asQt::Horizontal
+  Series mode=Column;  //same as Qt::Vertical
+  Series type=Linear;  // same as Qt::Horizontal
   TQString tmp;
   double dstep, dend, dstart;
   Sheet * m_pSheet;
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index 991f6433..fca76bbe 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -1871,7 +1871,7 @@ void Cell::offsetAlign( int _col, int _row )
 void Cell::textSize( TQPainter &_paint )
 {
   TQFontMetrics  fm = _paint.fontMetrics();
-  //Qt::Horizontal text ?
+  // Horizontal text ?
 
   int    tmpAngle;
   int    _row = row();
@@ -1919,7 +1919,7 @@ void Cell::textSize( TQPainter &_paint )
   // Set d->textWidth and d->textHeight to correct values according to
   // if the text is horizontal, vertical or rotated.
   if ( !tmpVerticalText && !tmpAngle ) {
-    //Qt::Horizontal text.
+    // Horizontal text.
 
     d->textWidth = format()->sheet()->doc()->unzoomItX( fm.width( d->strOutText ) );
     int offsetFont = 0;
@@ -1946,7 +1946,7 @@ void Cell::textSize( TQPainter &_paint )
         * cos ( tmpAngle * M_PI / 180 ) ) );
   }
   else {
-    //Qt::Vertical text.
+    // Vertical text.
     int width = 0;
     for ( unsigned int i = 0; i < d->strOutText.length(); i++ )
       width = TQMAX( width, fm.width( d->strOutText.at( i ) ) );
@@ -3348,7 +3348,7 @@ void Cell::paintText( TQPainter& painter,
   //        - One line of text , horizontal
   //        - Angled text
   //        - Multiple rows of text , horizontal
-  //        -Qt::Vertical text
+  //        - Vertical text
   if ( !tmpMultiRow && !tmpVerticalText && !tmpAngle ) {
     // Case 1: The simple case, one line, no angle.
 
@@ -3424,7 +3424,7 @@ void Cell::paintText( TQPainter& painter,
     } while ( i != -1 );
   }
   else if ( tmpVerticalText && !d->strOutText.isEmpty() ) {
-    // Case 4:Qt::Vertical text.
+    // Case 4: Vertical text.
 
     TQString t;
     int i = 0;
@@ -4139,7 +4139,7 @@ TQString Cell::textDisplaying( TQPainter &_painter )
     return TQString( "" );
   }
   else if ( format()->verticalText( column(), row() ) ) {
-    //Qt::Vertical text.
+    // Vertical text.
 
     RowFormat  *rl = format()->sheet()->rowFormat( row() );
     double      tmpIndent = 0.0;
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index cfcb3f86..0fe4f80d 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -693,12 +693,12 @@ void View::Private::initActions()
   actions->mergeCell->setToolTip(i18n("Merge the selected region."));
   actions->mergeCell->plug( actions->mergeCell->popupMenu() );
 
-  actions->mergeCellHorizontal = new TDEAction( i18n("Merge CellsQt::Horizontally"),"mergecell-horizontal",
+  actions->mergeCellHorizontal = new TDEAction( i18n("Merge Cells Horizontally"),"mergecell-horizontal",
       0, TQT_TQOBJECT(view), TQT_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" );
   actions->mergeCellHorizontal->setToolTip(i18n("Merge the selected region horizontally."));
   actions->mergeCellHorizontal->plug( actions->mergeCell->popupMenu() );
 
-  actions->mergeCellVertical = new TDEAction( i18n("Merge CellsQt::Vertically"),"mergecell-vertical",
+  actions->mergeCellVertical = new TDEAction( i18n("Merge Cells Vertically"),"mergecell-vertical",
       0, TQT_TQOBJECT(view), TQT_SLOT( mergeCellVertical() ), ac, "mergecellVertical" );
   actions->mergeCellVertical->setToolTip(i18n("Merge the selected region vertically."));
   actions->mergeCellVertical->plug( actions->mergeCell->popupMenu() );
@@ -2150,7 +2150,7 @@ if ( config->hasGroup("KSpread Page Layout" ) )
      {
   d->activeSheet->setPaperFormat((KoFormat)config->readNumEntry("Default size page",1));
 
-  d->activeSheet->setPaperQt::Orientation((KoOrientation)config->readNumEntry("Default orientation page",0));
+  d->activeSheet->setPaperOrientation((KoOrientation)config->readNumEntry("Default orientation page",0));
   d->activeSheet->setPaperUnit((KoUnit::Unit)config->readNumEntry("Default unit page",0));
      }
  }
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index b095191c..b8b603c8 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -903,11 +903,11 @@ TQString MergeManipulator::name() const
   {
     if (m_mergeHorizontal)
     {
-      return i18n("Merge CellsQt::Horizontally");
+      return i18n("Merge Cells Horizontally");
     }
     else if (m_mergeVertical)
     {
-      return i18n("Merge CellsQt::Vertically");
+      return i18n("Merge Cells Vertically");
     }
     else
     {
diff --git a/kspread/manipulator.h b/kspread/manipulator.h
index d7c03959..ede66863 100644
--- a/kspread/manipulator.h
+++ b/kspread/manipulator.h
@@ -47,12 +47,12 @@ class Sheet;
 //   int col;
 //   Format *l;
 // };
-// 
+//
 // struct layoutColumn {
 //   int col;
 //   ColumnFormat *l;
 // };
-// 
+//
 // struct layoutRow {
 //   int row;
 //   RowFormat *l;
@@ -388,7 +388,7 @@ class HorAlignManipulator : public FormatManipulator
     ~HorAlignManipulator() {}
 
   protected:
-    virtual TQString name() const { return i18n("ChangeQt::Horizontal Alignment"); }
+    virtual TQString name() const { return i18n("Change Horizontal Alignment"); }
 
   private:
 };
@@ -405,7 +405,7 @@ class VerAlignManipulator : public FormatManipulator
     ~VerAlignManipulator() {}
 
   protected:
-    virtual TQString name() const { return i18n("ChangeQt::Vertical Alignment"); }
+    virtual TQString name() const { return i18n("Change Vertical Alignment"); }
 
   private:
 };
diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp
index bde41bcc..8cf693f9 100644
--- a/kugar/lib/mlabelobject.cpp
+++ b/kugar/lib/mlabelobject.cpp
@@ -115,7 +115,7 @@ void MLabelObject::draw( TQPainter* p, int xoffset, int yoffset )
 
     // Set the text alignment flags
 
-    //Qt::Horizontal
+    // Horizontal
     switch ( hAlignment )
     {
     case MLabelObject::Left:
@@ -128,7 +128,7 @@ void MLabelObject::draw( TQPainter* p, int xoffset, int yoffset )
         tf = TQPainter::AlignRight;
     }
 
-    //Qt::Vertical
+    // Vertical
     switch ( vAlignment )
     {
     case MLabelObject::Top:
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index 042256a0..a95ab91f 100644
--- a/lib/koproperty/editors/cursoredit.cpp
+++ b/lib/koproperty/editors/cursoredit.cpp
@@ -46,14 +46,14 @@ CursorEdit::CursorEdit(Property *property, TQWidget *parent, const char *name)
 		(*m_spValues)[i18n("Cross")] = TQt::CrossCursor;
 		(*m_spValues)[i18n("Waiting")] = TQt::WaitCursor;
 		(*m_spValues)[i18n("iBeam")] = TQt::IbeamCursor;
-		(*m_spValues)[i18n("SizeQt::Vertical")] = TQt::SizeVerCursor;
-		(*m_spValues)[i18n("SizeQt::Horizontal")] = TQt::SizeHorCursor;
+		(*m_spValues)[i18n("Size Vertical")] = TQt::SizeVerCursor;
+		(*m_spValues)[i18n("Size Horizontal")] = TQt::SizeHorCursor;
 		(*m_spValues)[i18n("Size Slash")] = TQt::SizeBDiagCursor;
 		(*m_spValues)[i18n("Size Backslash")] = TQt::SizeFDiagCursor;
 		(*m_spValues)[i18n("Size All")] = TQt::SizeAllCursor;
 		(*m_spValues)[i18n("Blank")] = TQt::BlankCursor;
-		(*m_spValues)[i18n("SplitQt::Vertical")] = TQt::SplitVCursor;
-		(*m_spValues)[i18n("SplitQt::Horizontal")] = TQt::SplitHCursor;
+		(*m_spValues)[i18n("Split Vertical")] = TQt::SplitVCursor;
+		(*m_spValues)[i18n("Split Horizontal")] = TQt::SplitHCursor;
 		(*m_spValues)[i18n("Pointing Hand")] = TQt::PointingHandCursor;
 		(*m_spValues)[i18n("Forbidden")] = TQt::ForbiddenCursor;
 		(*m_spValues)[i18n("What's this")] = TQt::WhatsThisCursor;
@@ -62,7 +62,7 @@ CursorEdit::CursorEdit(Property *property, TQWidget *parent, const char *name)
 //! @todo NOT THREAD-SAFE
 	if (!m_cursorListData) {
 		TQValueList<TQVariant> keys;
-		keys 
+		keys
 			<< TQt::BlankCursor
 			<< TQt::ArrowCursor
 			<< TQt::UpArrowCursor
@@ -86,13 +86,13 @@ CursorEdit::CursorEdit(Property *property, TQWidget *parent, const char *name)
 			<< i18n("Mouse Cursor Shape", "Cross")
 			<< i18n("Mouse Cursor Shape", "Waiting")
 			<< i18n("Mouse Cursor Shape", "I")
-			<< i18n("Mouse Cursor Shape", "SizeQt::Vertical")
-			<< i18n("Mouse Cursor Shape", "SizeQt::Horizontal")
+			<< i18n("Mouse Cursor Shape", "Size Vertical")
+			<< i18n("Mouse Cursor Shape", "Size Horizontal")
 			<< i18n("Mouse Cursor Shape", "Size Slash")
 			<< i18n("Mouse Cursor Shape", "Size Backslash")
 			<< i18n("Mouse Cursor Shape", "Size All")
-			<< i18n("Mouse Cursor Shape", "SplitQt::Vertical")
-			<< i18n("Mouse Cursor Shape", "SplitQt::Horizontal")
+			<< i18n("Mouse Cursor Shape", "Split Vertical")
+			<< i18n("Mouse Cursor Shape", "Split Horizontal")
 			<< i18n("Mouse Cursor Shape", "Pointing Hand")
 			<< i18n("Mouse Cursor Shape", "Forbidden")
 			<< i18n("Mouse Cursor Shape", "What's This?");
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp
index 552bcf27..39817a20 100644
--- a/lib/kotext/KoTextFormatter.cpp
+++ b/lib/kotext/KoTextFormatter.cpp
@@ -30,7 +30,7 @@
 
 //#define DEBUG_FORMATTER
 
-//Qt::Vertical info (height, baseline etc.)
+// Vertical info (height, baseline etc.)
 //#define DEBUG_FORMATTER_VERT
 
 // Line and paragraph width