By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Minor cleanup of inadvertent changes

tqgeometry.diff (text/plain), 14.27 KB, created by Darrell on 2011-12-17 13:27:12 CST

(hide)

Description: Minor cleanup of inadvertent changes

Filename:

MIME Type:

Creator: Darrell

Created: 2011-12-17 13:27:12 CST

Size: 14.27 KB

patch

obsolete

>diff -urN kdegraphics/kcoloredit/kcoloredit.h kdegraphics.new/kcoloredit/kcoloredit.h >--- kdegraphics/kcoloredit/kcoloredit.h 2011-06-19 14:15:37.000000000 -0500 >+++ kdegraphics.new/kcoloredit/kcoloredit.h 2011-12-17 13:12:21.015111878 -0600 >@@ -74,7 +74,7 @@ > KColorEditDoc *document() const; > > protected: >- /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration >+ /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration > * file > */ > void saveOptions(); >diff -urN kdegraphics/kolourpaint/kpdocumentsaveoptionswidget.cpp kdegraphics.new/kolourpaint/kpdocumentsaveoptionswidget.cpp >--- kdegraphics/kolourpaint/kpdocumentsaveoptionswidget.cpp 2011-08-13 01:06:33.000000000 -0500 >+++ kdegraphics.new/kolourpaint/kpdocumentsaveoptionswidget.cpp 2011-12-17 13:20:05.847111384 -0600 >@@ -767,7 +767,7 @@ > if (m_previewDialogLastRelativeGeometry.isEmpty ()) > { > #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET >- kdDebug () << "\tread cfg preview dialog last rel tqgeometry" << endl; >+ kdDebug () << "\tread cfg preview dialog last rel geometry" << endl; > #endif > KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave); > KConfigBase *cfg = cfgGroupSaver.config (); >@@ -826,7 +826,7 @@ > > > #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET >- kdDebug () << "\ttqgeometry after show=" >+ kdDebug () << "\tgeometry after show=" > << TQRect (m_previewDialog->x (), m_previewDialog->y (), > m_previewDialog->width (), m_previewDialog->height ()) > << endl; >@@ -852,7 +852,7 @@ > cfg->sync (); > > #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET >- kdDebug () << "\tsaving preview tqgeometry " >+ kdDebug () << "\tsaving preview geometry " > << m_previewDialogLastRelativeGeometry > << " (TQt would have us believe " > << kpWidgetMapper::fromGlobal (m_visualParent, >@@ -942,7 +942,7 @@ > else > { > #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET >- kdDebug () << "\tnot visible - ignoring tqgeometry" << endl; >+ kdDebug () << "\tnot visible - ignoring geometry" << endl; > #endif > } > } >diff -urN kdegraphics/kolourpaint/kpmainwindow.cpp kdegraphics.new/kolourpaint/kpmainwindow.cpp >--- kdegraphics/kolourpaint/kpmainwindow.cpp 2011-08-13 01:06:33.000000000 -0500 >+++ kdegraphics.new/kolourpaint/kpmainwindow.cpp 2011-12-17 13:13:24.422859697 -0600 >@@ -808,7 +808,7 @@ > #endif > slotCreateThumbnail (); > } >- // this' tqgeometry is weird ATM >+ // this' geometry is weird ATM > else > { > #if DEBUG_KP_MAIN_WINDOW >diff -urN kdegraphics/kolourpaint/kpmainwindow_view.cpp kdegraphics.new/kolourpaint/kpmainwindow_view.cpp >--- kdegraphics/kolourpaint/kpmainwindow_view.cpp 2011-08-13 01:06:33.000000000 -0500 >+++ kdegraphics.new/kolourpaint/kpmainwindow_view.cpp 2011-12-17 13:21:12.348858529 -0600 >@@ -842,13 +842,13 @@ > TQRect rect (m_thumbnail->x (), m_thumbnail->y (), > m_thumbnail->width (), m_thumbnail->height ()); > #if DEBUG_KP_MAIN_WINDOW >- kdDebug () << "\tthumbnail relative tqgeometry=" << rect << endl; >+ kdDebug () << "\tthumbnail relative geometry=" << rect << endl; > #endif > > m_configThumbnailGeometry = mapFromGlobal (rect); > > #if DEBUG_KP_MAIN_WINDOW >- kdDebug () << "\tCONFIG: saving thumbnail tqgeometry " >+ kdDebug () << "\tCONFIG: saving thumbnail geometry " > << m_configThumbnailGeometry > << endl; > #endif >@@ -1067,11 +1067,11 @@ > kdDebug () << "\tcreating thumbnail" << endl; > #endif > >- // Read last saved tqgeometry before creating thumbnail & friends >+ // Read last saved geometry before creating thumbnail & friends > // in case they call notifyThumbnailGeometryChanged() > TQRect thumbnailGeometry = m_configThumbnailGeometry; > #if DEBUG_KP_MAIN_WINDOW >- kdDebug () << "\t\tlast used tqgeometry=" << thumbnailGeometry << endl; >+ kdDebug () << "\t\tlast used geometry=" << thumbnailGeometry << endl; > #endif > > m_thumbnail = new kpThumbnail (this, "thumbnail"); >@@ -1101,7 +1101,7 @@ > initialHeight); > > #if DEBUG_KP_MAIN_WINDOW >- kdDebug () << "\t\tcreating tqgeometry=" << geometryRect << endl; >+ kdDebug () << "\t\tcreating geometry=" << geometryRect << endl; > #endif > > geometryRect = mapToGlobal (geometryRect); >diff -urN kdegraphics/kolourpaint/widgets/kptooltoolbar.cpp kdegraphics.new/kolourpaint/widgets/kptooltoolbar.cpp >--- kdegraphics/kolourpaint/widgets/kptooltoolbar.cpp 2011-08-13 01:06:31.000000000 -0500 >+++ kdegraphics.new/kolourpaint/widgets/kptooltoolbar.cpp 2011-12-17 13:04:23.334108270 -0600 >@@ -199,7 +199,7 @@ > > if (m_defaultIconSize <= 0) > { >- // Adapt according to screen tqgeometry >+ // Adapt according to screen geometry > const TQRect desktopSize = KGlobalSettings::desktopGeometry (this); > #if DEBUG_KP_TOOL_TOOL_BAR > kdDebug () << "\tadapting to screen size=" << desktopSize << endl; >diff -urN kdegraphics/kpdf/ui/pageview.cpp kdegraphics.new/kpdf/ui/pageview.cpp >--- kdegraphics/kpdf/ui/pageview.cpp 2011-08-13 01:06:01.000000000 -0500 >+++ kdegraphics.new/kpdf/ui/pageview.cpp 2011-12-17 13:11:58.836859382 -0600 >@@ -1333,7 +1333,7 @@ > p->save(); > p->translate( pixmapGeometry.left(), pixmapGeometry.top() ); > >- // item pixmap and outline tqgeometry >+ // item pixmap and outline geometry > TQRect outlineGeometry = pixmapGeometry; > outlineGeometry.addCoords( -1, -1, 3, 3 ); > >@@ -1677,7 +1677,7 @@ > fullHeight = 0; > TQRect viewportRect( contentsX(), contentsY(), viewportWidth, viewportHeight ); > >- // set all items tqgeometry and resize contents. handle 'continuous' and 'single' modes separately >+ // set all items geometry and resize contents. handle 'continuous' and 'single' modes separately > if ( KpdfSettings::viewContinuous() ) > { > // Here we find out column's width and row's height to compute a table >diff -urN kdegraphics/kpdf/ui/pageviewutils.cpp kdegraphics.new/kpdf/ui/pageviewutils.cpp >--- kdegraphics/kpdf/ui/pageviewutils.cpp 2011-08-13 01:06:01.000000000 -0500 >+++ kdegraphics.new/kpdf/ui/pageviewutils.cpp 2011-12-17 13:04:20.837860522 -0600 >@@ -54,7 +54,7 @@ > iconXOffset = 0, > shadowOffset = 1; > >- // load icon (if set) and update tqgeometry >+ // load icon (if set) and update geometry > TQPixmap symbol; > if ( icon != None ) > { >diff -urN kdegraphics/kpdf/ui/pageviewutils.h kdegraphics.new/kpdf/ui/pageviewutils.h >--- kdegraphics/kpdf/ui/pageviewutils.h 2011-08-13 01:06:01.000000000 -0500 >+++ kdegraphics.new/kpdf/ui/pageviewutils.h 2011-12-17 13:10:46.644149557 -0600 >@@ -23,7 +23,7 @@ > /** > * @short PageViewItem represents graphically a kpdfpage into the PageView. > * >- * It has methods for settings Item's tqgeometry and other visual properties such >+ * It has methods for settings Item's geometry and other visual properties such > * as the individual zoom factor. > */ > class PageViewItem >diff -urN kdegraphics/kpdf/ui/presentationwidget.cpp kdegraphics.new/kpdf/ui/presentationwidget.cpp >--- kdegraphics/kpdf/ui/presentationwidget.cpp 2011-08-13 01:06:01.000000000 -0500 >+++ kdegraphics.new/kpdf/ui/presentationwidget.cpp 2011-12-17 13:11:22.622862442 -0600 >@@ -43,7 +43,7 @@ > #define ENABLE_PROGRESS_OVERLAY > > >-// a frame contains a pointer to the page object, its tqgeometry and the >+// a frame contains a pointer to the page object, its geometry and the > // transition effect to the next frame > struct PresentationFrame > { >@@ -56,7 +56,7 @@ > : TQDialog( parent, "presentationWidget", true, WDestructiveClose | WStyle_NoBorder), > m_pressedLink( 0 ), m_handCursor( false ), m_document( doc ), m_frameIndex( -1 ) > { >- // set look and tqgeometry >+ // set look and geometry > setBackgroundMode( TQt::NoBackground ); > > m_width = -1; >@@ -124,7 +124,7 @@ > { > PresentationFrame * frame = new PresentationFrame(); > frame->page = *setIt; >- // calculate frame tqgeometry keeping constant aspect ratio >+ // calculate frame geometry keeping constant aspect ratio > float pageRatio = frame->page->ratio(); > int pageWidth = m_width, > pageHeight = m_height; >@@ -289,7 +289,7 @@ > // show the bar if reaching top 2 pixels > if ( e->y() <= (tqgeometry().top() + 1) ) > m_topBar->show(); >- // handle "dragging the wheel" if clicking on its tqgeometry >+ // handle "dragging the wheel" if clicking on its geometry > else if ( e->state() == Qt::LeftButton && m_overlayGeometry.contains( e->pos() ) ) > overlayClick( e->pos() ); > } >@@ -378,7 +378,7 @@ > if ( m_frameIndex < 0 || m_frameIndex >= (int)m_frames.size() ) > return 0; > >- // get frame, page and tqgeometry >+ // get frame, page and geometry > const PresentationFrame * frame = m_frames[ m_frameIndex ]; > const KPDFPage * page = frame->page; > const TQRect & frameGeometry = frame->tqgeometry; >@@ -396,7 +396,7 @@ > if ( !object ) > return 0; > >- // compute link tqgeometry if destination rect present >+ // compute link geometry if destination rect present > if ( tqgeometry ) > { > *tqgeometry = object->tqgeometry( frameGeometry.width(), frameGeometry.height() ); >@@ -622,7 +622,7 @@ > void PresentationWidget::generateOverlay() > { > #ifdef ENABLE_PROGRESS_OVERLAY >- // calculate overlay tqgeometry and resize pixmap if needed >+ // calculate overlay geometry and resize pixmap if needed > int side = m_width / 16; > m_overlayGeometry.setRect( m_width - side - 4, 4, side, side ); > if ( m_lastRenderedOverlay.width() != side ) >diff -urN kdegraphics/kpovmodeler/pmdockwidget.h kdegraphics.new/kpovmodeler/pmdockwidget.h >--- kdegraphics/kpovmodeler/pmdockwidget.h 2011-08-13 01:06:24.000000000 -0500 >+++ kdegraphics.new/kpovmodeler/pmdockwidget.h 2011-12-17 13:18:14.577109808 -0600 >@@ -855,7 +855,7 @@ > #ifndef NO_KDE2 > /** > * Saves the current state of the dockmanager and of all controlled widgets. >- * State means here to save the tqgeometry, visibility, parents, internal object names, orientation, >+ * State means here to save the geometry, visibility, parents, internal object names, orientation, > * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and > * last but not least some necessary things for recovering the dockmainwindow state. > * >diff -urN kdegraphics/ksvg/dom/SVGLocatable.h kdegraphics.new/ksvg/dom/SVGLocatable.h >--- kdegraphics/ksvg/dom/SVGLocatable.h 2011-08-13 01:06:35.000000000 -0500 >+++ kdegraphics.new/ksvg/dom/SVGLocatable.h 2011-12-17 13:09:30.782109310 -0600 >@@ -66,7 +66,7 @@ > > /** > * Returns the tight bounding box in current user space (i.e., after application of >- * the <code>transform</code> attribute, if any) on the tqgeometry of all contained graphics >+ * the <code>transform</code> attribute, if any) on the geometry of all contained graphics > * elements, exclusive of stroke-width and filter effects). > * > * @return An SVGRect object that defines the bounding box. >diff -urN kdegraphics/kuickshow/src/kuickshow.cpp kdegraphics.new/kuickshow/src/kuickshow.cpp >--- kdegraphics/kuickshow/src/kuickshow.cpp 2011-08-13 01:06:34.000000000 -0500 >+++ kdegraphics.new/kuickshow/src/kuickshow.cpp 2011-12-17 13:22:09.225108955 -0600 >@@ -552,7 +552,7 @@ > this, TQT_SLOT (slotTrashCurrentImage (ImageWindow *))); > if ( s_viewers.count() == 1 && moveToTopLeft ) { > // we have to move to 0x0 before showing _and_ >- // after showing, otherwise we get some bogus tqgeometry() >+ // after showing, otherwise we get some bogus geometry() > m_viewer->move( Kuick::workArea().topLeft() ); > } > >diff -urN kdegraphics/kviewshell/plugins/djvu/libdjvu/DjVuPort.h kdegraphics.new/kviewshell/plugins/djvu/libdjvu/DjVuPort.h >--- kdegraphics/kviewshell/plugins/djvu/libdjvu/DjVuPort.h 2011-08-13 01:06:40.000000000 -0500 >+++ kdegraphics.new/kviewshell/plugins/djvu/libdjvu/DjVuPort.h 2011-12-17 13:04:24.416110650 -0600 >@@ -213,7 +213,7 @@ > @param source The sender of the request */ > virtual void notify_redisplay(const class DjVuImage * source); > >- /** This notification is sent by \ref{DjVuImage} when its tqgeometry >+ /** This notification is sent by \ref{DjVuImage} when its geometry > has been changed as a result of decoding. It may be used to > implement progressive redisplay. */ > virtual void notify_retqlayout(const class DjVuImage * source); >diff -urN kdegraphics/kviewshell/plugins/djvu/libdjvu/GMapAreas.h kdegraphics.new/kviewshell/plugins/djvu/libdjvu/GMapAreas.h >--- kdegraphics/kviewshell/plugins/djvu/libdjvu/GMapAreas.h 2011-06-19 14:15:49.000000000 -0500 >+++ kdegraphics.new/kviewshell/plugins/djvu/libdjvu/GMapAreas.h 2011-12-17 13:04:24.491110372 -0600 >@@ -91,7 +91,7 @@ > If this {\bf URL} is not empty then the map area will work like a > hyperlink. > >- The classes also implement some useful functions to ease tqgeometry >+ The classes also implement some useful functions to ease geometry > manipulations > > @memo Definition of base map area classes >@@ -305,7 +305,7 @@ > /// Returns the height of the rectangle > int get_height(void) const { return ymax-ymin; } > >- /// Changes the #GMapRect#'s tqgeometry >+ /// Changes the #GMapRect#'s geometry > GMapRect & operator=(const GRect & rect); > > /// Returns \Ref{GRect} describing the map area's rectangle >diff -urN kdegraphics/kviewshell/plugins/djvu/libdjvu/IW44Image.h kdegraphics.new/kviewshell/plugins/djvu/libdjvu/IW44Image.h >--- kdegraphics/kviewshell/plugins/djvu/libdjvu/IW44Image.h 2011-08-13 01:06:40.000000000 -0500 >+++ kdegraphics.new/kviewshell/plugins/djvu/libdjvu/IW44Image.h 2011-12-17 13:04:24.090110313 -0600 >@@ -618,7 +618,7 @@ > int pixsep=1, int fast=0); > // array of blocks > IW44Image::Block *blocks; >- // tqgeometry >+ // geometry > int iw, ih; > int bw, bh; > int nb; View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]