From 45f529de247fc4b3662f6b474abe03fe904306ec Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:31:39 -0600 Subject: Rename old tq methods that no longer need a unique name --- kviewshell/documentWidget.cpp | 2 +- kviewshell/kmultipage.cpp | 4 ++-- kviewshell/kprintDialogPage_pageoptions.cpp | 2 +- kviewshell/kviewpart.cpp | 10 +++++----- kviewshell/marklist.cpp | 2 +- kviewshell/marklist.h | 2 +- kviewshell/optionDialogAccessibilityWidget.ui | 16 ++++++++-------- kviewshell/pageSizeDialog.cpp | 2 +- kviewshell/pageSizeWidget_base.ui | 2 +- kviewshell/pageView.cpp | 2 +- ...intDialogPage_DJVUconversionoptions_basewidget.ui | 2 +- .../djvu/kprintDialogPage_DJVUpageoptions.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp | 14 +++++++------- kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h | 20 ++++++++++---------- kviewshell/renderedDocumentPagePixmap.cpp | 2 +- kviewshell/searchWidget.cpp | 2 +- kviewshell/sizePreview.cpp | 2 +- 17 files changed, 44 insertions(+), 44 deletions(-) (limited to 'kviewshell') diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index f370daba..cd3de424 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -203,7 +203,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) p.drawRect(outlineRect); // Paint page shadow - TQColor backgroundColor = tqcolorGroup().mid(); + TQColor backgroundColor = colorGroup().mid(); // (Re-)generate the Pixmaps for the shadow corners, if necessary if (backgroundColor != backgroundColorForCorners) diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp index 7fc41986..ca6d569b 100644 --- a/kviewshell/kmultipage.cpp +++ b/kviewshell/kmultipage.cpp @@ -54,7 +54,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject splitterWidget = new TQSplitter(verticalBox, widgetName); splitterWidget->setOpaqueResize(false); - splitterWidget->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + splitterWidget->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); // Create SideBar sideBar = new TQToolBox(splitterWidget, "sidebar"); @@ -216,7 +216,7 @@ bool KMultiPage::closeURL() // Clear Table of Contents tableOfContents->clear(); - // Clear tqStatus Bar + // Clear Status Bar emit setStatusBarText(TQString()); return true; diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp index 603c2552..62ce70be 100644 --- a/kviewshell/kprintDialogPage_pageoptions.cpp +++ b/kviewshell/kprintDialogPage_pageoptions.cpp @@ -91,7 +91,7 @@ KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, co } - resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(319, 166).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 186a2823..b205f37b 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -96,7 +96,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // If a default MimeType is specified try to load a MultiPage supporting it. TQString defaultMimeType = args.first(); offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage" ), + TQString::fromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " "([X-KDE-MimeTypes] == '%2')").tqarg(MULTIPAGE_VERSION).tqarg(defaultMimeType)); } @@ -105,7 +105,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p if (offers.isEmpty()) { offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage" ), + TQString::fromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " "([X-KDE-EmptyMultiPage] == 1)").tqarg(MULTIPAGE_VERSION)); } @@ -471,7 +471,7 @@ TQStringList KViewPart::supportedMimeTypes() // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage"), + TQString::fromLatin1("KViewShell/MultiPage"), TQString("([X-KDE-MultiPageVersion] == %1)").tqarg(MULTIPAGE_VERSION) ); @@ -516,7 +516,7 @@ TQStringList KViewPart::fileFormats() const // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage"), + TQString::fromLatin1("KViewShell/MultiPage"), TQString("([X-KDE-MultiPageVersion] == %1)").tqarg(MULTIPAGE_VERSION) ); @@ -768,7 +768,7 @@ bool KViewPart::openFile() // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1("KViewShell/MultiPage" ), + TQString::fromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " "([X-KDE-MimeTypes] == '%2')").tqarg(MULTIPAGE_VERSION).tqarg(mimetype->name())); diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index 19d17b06..57266853 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -284,7 +284,7 @@ MarkList::MarkList(TQWidget* parent, const char* name) setVScrollBarMode(TQScrollView::AlwaysOn); setHScrollBarMode(TQScrollView::AlwaysOff); - tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); viewport()->setBackgroundMode(TQt::PaletteBase); enableClipper(true); diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h index 25c44aac..80d796a7 100644 --- a/kviewshell/marklist.h +++ b/kviewshell/marklist.h @@ -140,7 +140,7 @@ public: PageNumber numberOfPages() { return widgetList.count(); } - virtual TQSize tqsizeHint() const { return TQSize(); } + virtual TQSize sizeHint() const { return TQSize(); } public slots: void setNumberOfPages(int numberOfPages, bool showThumbnails = true); diff --git a/kviewshell/optionDialogAccessibilityWidget.ui b/kviewshell/optionDialogAccessibilityWidget.ui index 09ff3af3..ea0cc6d2 100644 --- a/kviewshell/optionDialogAccessibilityWidget.ui +++ b/kviewshell/optionDialogAccessibilityWidget.ui @@ -138,7 +138,7 @@ Fixed - + 16 20 @@ -180,7 +180,7 @@ Expanding - + 30 20 @@ -218,7 +218,7 @@ Expanding - + 48 21 @@ -246,7 +246,7 @@ Fixed - + 16 20 @@ -274,7 +274,7 @@ Expanding - + 48 21 @@ -302,7 +302,7 @@ Fixed - + 16 20 @@ -359,7 +359,7 @@ Fixed - + 16 20 @@ -376,7 +376,7 @@ Fixed - + 16 20 diff --git a/kviewshell/pageSizeDialog.cpp b/kviewshell/pageSizeDialog.cpp index fba7f752..75c4409d 100644 --- a/kviewshell/pageSizeDialog.cpp +++ b/kviewshell/pageSizeDialog.cpp @@ -31,7 +31,7 @@ pageSizeDialog::pageSizeDialog( TQWidget *parent, pageSize *userPrefdPageSize, c { userPreferredPageSize = userPrefdPageSize; pageSizeW = new pageSizeWidget(this, "PageSizeWidget"); - pageSizeW->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, + pageSizeW->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, pageSizeW->sizePolicy().hasHeightForWidth() ) ); setMainWidget(pageSizeW); } diff --git a/kviewshell/pageSizeWidget_base.ui b/kviewshell/pageSizeWidget_base.ui index e7ddbde3..3940deda 100644 --- a/kviewshell/pageSizeWidget_base.ui +++ b/kviewshell/pageSizeWidget_base.ui @@ -209,7 +209,7 @@ 0 - + 250 50 diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp index 6dad756b..81c0c8b2 100644 --- a/kviewshell/pageView.cpp +++ b/kviewshell/pageView.cpp @@ -524,7 +524,7 @@ void PageView::viewportPaintEvent(TQPaintEvent* e) TQMemArray backgroundRects = backgroundArea.tqrects(); for (unsigned int i = 0; i < backgroundRects.count(); i++) - p.fillRect(backgroundRects[i], tqcolorGroup().mid()); + p.fillRect(backgroundRects[i], colorGroup().mid()); } diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui index bfaf546c..8a533ab6 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui @@ -132,7 +132,7 @@ Expanding - + 20 40 diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp index 4b5e633a..4287fe54 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp @@ -70,7 +70,7 @@ KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *pa kprintDialogPage_pageoptions_baseLayout->addStretch(); - resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(319, 166).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp index c765fdd0..e7c74b84 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp @@ -102,7 +102,7 @@ DjVuErrorList::notify_error(const DjVuPort * source, const GUTF8String & msg) bool DjVuErrorList::notify_status(const DjVuPort * source, const GUTF8String &msg) { - tqStatus.append(msg); + Status.append(msg); return 1; } @@ -120,16 +120,16 @@ DjVuErrorList::GetError(void) } GUTF8String -DjVuErrorList::GettqStatus(void) +DjVuErrorList::GetStatus(void) { - GUTF8String PrevtqStatus; + GUTF8String PrevStatus; GPosition pos; - if((pos=tqStatus)) + if((pos=Status)) { - PrevtqStatus=tqStatus[pos]; - tqStatus.del(pos); + PrevStatus=Status[pos]; + Status.del(pos); } - return PrevtqStatus; + return PrevStatus; } GP diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h index c42e96e2..885e76aa 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h @@ -126,13 +126,13 @@ public: inline GList GetStatusList(void); /// Just clear the list. - inline void CleartqStatus(void); + inline void ClearStatus(void); /// Get one status message and clear that message from the list. - GUTF8String GettqStatus(void); + GUTF8String GetStatus(void); /// Check if there are any more status messages. - inline bool HastqStatus(void) const; + inline bool HasStatus(void) const; /** This gets the data. We can't use the simple port's request data since we want to allow the user to specify the ByteStream. */ @@ -143,7 +143,7 @@ private: GURL pool_url; GP pool; GList Errors; - GList tqStatus; + GList Status; private: //dummy stuff static GURL set_stream(ByteStream *); }; @@ -167,22 +167,22 @@ DjVuErrorList::ClearError(void) inline GList DjVuErrorList::GetStatusList(void) { - GList retval=(const GList)tqStatus; - tqStatus.empty(); + GList retval=(const GList)Status; + Status.empty(); return retval; } inline void -DjVuErrorList::CleartqStatus(void) -{ tqStatus.empty(); } +DjVuErrorList::ClearStatus(void) +{ Status.empty(); } inline bool DjVuErrorList::HasError(void) const { return !Errors.isempty(); } inline bool -DjVuErrorList::HastqStatus(void) const -{ return !tqStatus.isempty(); } +DjVuErrorList::HasStatus(void) const +{ return !Status.isempty(); } #ifdef HAVE_NAMESPACES diff --git a/kviewshell/renderedDocumentPagePixmap.cpp b/kviewshell/renderedDocumentPagePixmap.cpp index fc8edade..1632cbd9 100644 --- a/kviewshell/renderedDocumentPagePixmap.cpp +++ b/kviewshell/renderedDocumentPagePixmap.cpp @@ -71,7 +71,7 @@ TQPixmap RenderedDocumentPagePixmap::accessiblePixmap() { case KVSPrefs::EnumRenderMode::Inverted: // Invert image pixels using TQImage internal function - backImage.tqinvertPixels(false); + backImage.invertPixels(false); break; case KVSPrefs::EnumRenderMode::Recolor: // Recolor image using KImageEffect::flatten with dither:0 diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp index d467249d..b7001240 100644 --- a/kviewshell/searchWidget.cpp +++ b/kviewshell/searchWidget.cpp @@ -41,7 +41,7 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl) { setName("SearchWidget"); - tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); tqlayout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout"); diff --git a/kviewshell/sizePreview.cpp b/kviewshell/sizePreview.cpp index 0acd8843..07211819 100644 --- a/kviewshell/sizePreview.cpp +++ b/kviewshell/sizePreview.cpp @@ -74,7 +74,7 @@ void SizePreview::paintEvent( TQPaintEvent * ) pixmap.resize(width(), height()); TQPainter p(&pixmap); - p.fillRect(rect(), tqcolorGroup().background()); + p.fillRect(rect(), colorGroup().background()); p.setPen(TQt::black); p.setBrush(TQt::white); p.drawRect(hOffset, vOffset, displayedWidth, displayedHeight); -- cgit v1.2.1