Branch: master

357c5d37 2015-03-04 22:07:44 Slávek Banko
Fix incorrectly renamed strings
M kfax/kfax.cpp
M kolourpaint/kpview.h
M kooka/kocrgocr.cpp
M kooka/kocrkadmos.cpp
M kooka/kocrocrad.cpp
M kooka/kooka.cpp
M kpdf/conf/dlgpresentation.ui
M tdefile-plugins/pcx/tdefile_pcx.h
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 819c81a..716bcbb 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -209,13 +209,13 @@
   qtwin = faxqtwin->winId();
   faxqtwin->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
 
-  // Create aQt::Vertical scroll bar
+  // Create a Vertical scroll bar
 
   vsb = new TQScrollBar( Qt::Vertical,faxqtwin,"scrollBar" );
   vsb->hide();
   connect( vsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollVert(int)) );
 
-  // Create aQt::Horizontal scroll bar
+  // Create a Horizontal scroll bar
 
   hsb = new TQScrollBar( Qt::Horizontal,faxqtwin,"scrollBar" );
   connect( hsb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollHorz(int)) );
@@ -530,7 +530,7 @@
   (void) notetiff(TQFile::encodeName(filename));
 
   struct pagenode *pn;
-  for(pn = firstpage; pn; pn = pn->next) 
+  for(pn = firstpage; pn; pn = pn->next)
    if (!pn->dpiX) {
 	pn->dpiX = dpi.width();
 	pn->dpiY = dpi.height();
@@ -705,7 +705,7 @@
   printer.setDocName( TQString("%1 - %2").arg(firstpage->name).arg(i18n("KFax")));
   printer.setDocFileName( firstpage->name );
   printer.setPageSelection( KPrinter::ApplicationSide );
-  printer.setMinMax( 1, pages ); 
+  printer.setMinMax( 1, pages );
   printer.setCurrentPage( currentpage );
   printer.addDialogPage(new KFAXPrintSettings());
   if ( !printer.setup( this ) )
@@ -777,9 +777,9 @@
 			Image->height * dm.logicalDpiY() / pn->dpiY
 		);
 
-    kdDebug()	<< "Org image size = " << Image->width << "x" << Image->height 
+    kdDebug()	<< "Org image size = " << Image->width << "x" << Image->height
 		<< " logical picture res = " << pn->dpiX << "x" << pn->dpiY << endl;
-    kdDebug()	<< "New image size = " << size 
+    kdDebug()	<< "New image size = " << size
 		<< " logical printer res = " << dm.logicalDpiX() << "x" << dm.logicalDpiY() << endl;
 
     uint top, left, bottom, right;
@@ -826,7 +826,7 @@
     }
 
     statusbar->message( i18n( "Saving..." ) );
-   
+
     KURL source = KURL::fromPathOrURL(thispage->pathname);
     bool ok = TDEIO::NetAccess::file_copy( source, dest, -1, true, false, this);
 
@@ -1359,7 +1359,7 @@
   setCaption(TQFile::decodeName(thispage->name));
 
   Image = generateZoomImages(oz);
-  
+
   PaneWidth = Image->width;
   PaneHeight = Image->height;
   Refresh = 1;
diff --git a/kolourpaint/kpview.h b/kolourpaint/kpview.h
index 879c2b0..a43eb12 100644
--- a/kolourpaint/kpview.h
+++ b/kolourpaint/kpview.h
@@ -59,7 +59,7 @@
 class kpView : public TQWidget
 {
 Q_OBJECT
-  
+
 
 public:
     /**
@@ -148,8 +148,8 @@
     /**
      * Sets the horizontal and vertical zoom levels.
      *
-     * @param hzoomQt::Horizontal zoom level.
-     * @param vzoomQt::Vertical zoom level.
+     * @param hzoom Horizontal zoom level.
+     * @param vzoom Vertical zoom level.
      *
      * If reimplementing, you must call this base implementation.
      */
@@ -228,7 +228,7 @@
 public:
 
     /**
-     * @param viewXQt::Horizontal position in view coordinates.
+     * @param viewX Horizontal position in view coordinates.
      *
      * @returns viewX transformed to document coordinates, based on the
      *                origin() and zoomLevelX().
@@ -236,7 +236,7 @@
     double transformViewToDocX (double viewX) const;
 
     /**
-     * @param viewYQt::Vertical position in view coordinates.
+     * @param viewY Vertical position in view coordinates.
      *
      * @returns viewY transformed to document coordinates, based on the
      *                origin() and zoomLevelY().
@@ -265,7 +265,7 @@
 
 
     /**
-     * @param docXQt::Horizontal position in document coordinates.
+     * @param docX Horizontal position in document coordinates.
      *
      * @returns docX transformed to view coordinates, based on the origin()
      *               and zoomLevelX().
@@ -273,7 +273,7 @@
     double transformDocToViewX (double docX) const;
 
     /**
-     * @param docYQt::Vertical position in document coordinates.
+     * @param docY Vertical position in document coordinates.
      *
      * @returns docY transformed to view coordinates, based on the origin()
      *               and zoomLevelY().
@@ -313,8 +313,8 @@
      */
     TQPoint transformViewToOtherView (const TQPoint &viewPoint,
                                      const kpView *otherView);
-    
-                                        
+
+
     /**
      * @returns the approximate view width required to display the entire
      *          document(), based on the zoom level only.
@@ -374,7 +374,7 @@
      * is set to queue updates.
      */
     void updateQueuedArea ();
-    
+
     void updateMicroFocusHint (const TQRect &microFocusHint);
 
 
@@ -484,7 +484,7 @@
 
     virtual void dragEnterEvent (TQDragEnterEvent *);
     virtual void dragLeaveEvent (TQDragLeaveEvent *);
-    
+
     virtual void imStartEvent (TQIMEvent *e);
     virtual void imComposeEvent (TQIMEvent *e);
     virtual void imEndEvent (TQIMEvent *e);
diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp
index 8f1ba01..8b21ca5 100644
--- a/kooka/kocrgocr.cpp
+++ b/kooka/kocrgocr.cpp
@@ -96,7 +96,7 @@
     TDEConfig *conf = TDEGlobal::config ();
     conf->setGroup( CFG_GROUP_OCR_DIA );
 
-    //Qt::Horizontal line
+    // Horizontal line
     // (void) new  KSeparator( KSeparator::HLine, page);
 
     // Entry-Field.
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 0862f73..17ef016 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -271,7 +271,7 @@
     /* continue page setup on the first page */
     TQVBox *page = ocrPage();
 
-    //Qt::Horizontal line
+    // Horizontal line
     (void) new KSeparator( KSeparator::HLine, page);
 
     // FIXME: dynamic classifier reading.
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index 2e824fa..04440b2 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -107,7 +107,7 @@
     TDEConfig *conf = TDEGlobal::config ();
     conf->setGroup( CFG_GROUP_OCR_DIA );
 
-    //Qt::Horizontal line
+    // Horizontal line
     // (void) new  KSeparator( KSeparator::HLine, page);
 
     // Entry-Field.
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index 5905c30..9c9c601 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -128,7 +128,7 @@
     KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection());
     KStdAction::quit(TQT_TQOBJECT(this) , TQT_SLOT(close()), actionCollection());
 
-    KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), 
+    KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
     KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()),
 				  actionCollection());
@@ -192,7 +192,7 @@
 		       TQT_TQOBJECT(this), TQT_SLOT( slMirrorVertical() ),
 		       actionCollection(), "mirrorVertical" );
 
-    (void) new TDEAction(i18n("&Mirror ImageQt::Horizontally"), "mirror-horiz", CTRL+Key_M,
+    (void) new TDEAction(i18n("&Mirror Image Horizontally"), "mirror-horiz", CTRL+Key_M,
 		       TQT_TQOBJECT(this), TQT_SLOT( slMirrorHorizontal() ),
 		       actionCollection(), "mirrorHorizontal" );
 
diff --git a/kpdf/conf/dlgpresentation.ui b/kpdf/conf/dlgpresentation.ui
index f0668e1..744d5b5 100644
--- a/kpdf/conf/dlgpresentation.ui
+++ b/kpdf/conf/dlgpresentation.ui
@@ -86,12 +86,12 @@
                 <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
-                            <string>Blinds::Vertical</string>
+                            <string>Blinds Vertical</string>
                         </property>
                     </item>
                     <item>
                         <property name="text">
-                            <string>Blinds::Horizontal</string>
+                            <string>Blinds Horizontal</string>
                         </property>
                     </item>
                     <item>
@@ -136,22 +136,22 @@
                     </item>
                     <item>
                         <property name="text">
-                            <string>SplitQt::Horizontal In</string>
+                            <string>Split Horizontal In</string>
                         </property>
                     </item>
                     <item>
                         <property name="text">
-                            <string>SplitQt::Horizontal Out</string>
+                            <string>Split Horizontal Out</string>
                         </property>
 ** Diff limit reached (max: 250 lines) **