From 844e85f38df237672dce1aa370bade4398cb3d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 5 Mar 2015 05:07:44 +0100 Subject: Fix incorrectly renamed strings (cherry picked from commit 357c5d375f2bbb11bafae91ecafe27bf7de60dc2) --- kfax/kfax.cpp | 16 ++++++++-------- kolourpaint/kpview.h | 22 +++++++++++----------- kooka/kocrgocr.cpp | 2 +- kooka/kocrkadmos.cpp | 2 +- kooka/kocrocrad.cpp | 2 +- kooka/kooka.cpp | 4 ++-- kpdf/conf/dlgpresentation.ui | 12 ++++++------ tdefile-plugins/pcx/tdefile_pcx.h | 6 +++--- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index 819c81af..716bcbb6 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -209,13 +209,13 @@ TopLevel::TopLevel (TQWidget *, const char *name) 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 loadfile(TQString filename) (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 @@ void TopLevel::print(){ 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 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter ) 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 @@ void TopLevel::saveNetFile( const KURL& dest) } 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 @@ void TopLevel::newPage(){ 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 879c2b0e..a43eb12e 100644 --- a/kolourpaint/kpview.h +++ b/kolourpaint/kpview.h @@ -59,7 +59,7 @@ class kpViewScrollableContainer; class kpView : public TQWidget { Q_OBJECT - + public: /** @@ -148,8 +148,8 @@ public: /** * 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 @@ protected slots: 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 @@ public: 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 @@ public: /** - * @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 @@ public: 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 @@ public: */ 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 @@ public: * is set to queue updates. */ void updateQueuedArea (); - + void updateMicroFocusHint (const TQRect µFocusHint); @@ -484,7 +484,7 @@ protected: 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 8f1ba019..8b21ca5a 100644 --- a/kooka/kocrgocr.cpp +++ b/kooka/kocrgocr.cpp @@ -96,7 +96,7 @@ EngineError KGOCRDialog::setupGui() 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 0862f73b..17ef016f 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -271,7 +271,7 @@ EngineError KadmosDialog::setupGui() /* 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 2e824fae..04440b2c 100644 --- a/kooka/kocrocrad.cpp +++ b/kooka/kocrocrad.cpp @@ -107,7 +107,7 @@ EngineError ocradDialog::setupGui() 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 5905c302..9c9c6011 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -128,7 +128,7 @@ void Kooka::setupActions() 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 @@ actionCollection()); 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 f0668e17..744d5b5f 100644 --- a/kpdf/conf/dlgpresentation.ui +++ b/kpdf/conf/dlgpresentation.ui @@ -86,12 +86,12 @@ - Blinds::Vertical + Blinds Vertical - Blinds::Horizontal + Blinds Horizontal @@ -136,22 +136,22 @@ - SplitQt::Horizontal In + Split Horizontal In - SplitQt::Horizontal Out + Split Horizontal Out - SplitQt::Vertical In + Split Vertical In - SplitQt::Vertical Out + Split Vertical Out diff --git a/tdefile-plugins/pcx/tdefile_pcx.h b/tdefile-plugins/pcx/tdefile_pcx.h index 14e9e628..c8e0726e 100644 --- a/tdefile-plugins/pcx/tdefile_pcx.h +++ b/tdefile-plugins/pcx/tdefile_pcx.h @@ -62,9 +62,9 @@ struct PCXHEADER // calculate from Xmax-Xmin.· TQ_UINT16 PaletteInfo; // How to interpret palette- 1 = Color/BW, // 2 = Grayscale ( ignored in PB IV/ IV + )· - TQ_UINT16 HScreenSize; //Qt::Horizontal screen size in pixels. New field + TQ_UINT16 HScreenSize; // Horizontal screen size in pixels. New field // found only in PB IV/IV Plus - TQ_UINT16 VScreenSize; //Qt::Vertical screen size in pixels. New field + TQ_UINT16 VScreenSize; // Vertical screen size in pixels. New field // found only in PB IV/IV Plus TQ_UINT8 Filler[ 54 ]; // Blank to fill out 128 byte header. Set all // bytes to 0 @@ -73,7 +73,7 @@ struct PCXHEADER class KPcxPlugin: public KFilePlugin { Q_OBJECT - + public: KPcxPlugin(TQObject *parent, const char *name, const TQStringList& args); -- cgit v1.2.1