From ec1fddcd0d6663ad273af85357f04abbc5689468 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:00 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a. --- kviewshell/kmultipage.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'kviewshell/kmultipage.cpp') diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp index 1325b50f..7fc41986 100644 --- a/kviewshell/kmultipage.cpp +++ b/kviewshell/kmultipage.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject splitterWidget = new TQSplitter(verticalBox, widgetName); splitterWidget->setOpaqueResize(false); - splitterWidget->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + splitterWidget->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); // Create SideBar sideBar = new TQToolBox(splitterWidget, "sidebar"); @@ -117,7 +117,7 @@ void KMultiPage::readSettings() void KMultiPage::writeSettings() { - // Save TOC layout + // Save TOC tqlayout tableOfContents->writeSettings(); KVSPrefs::setGuiLayout(splitterWidget->sizes()); @@ -166,7 +166,7 @@ void KMultiPage::slotSave() fileName = fileName+ending; if (TQFile(fileName).exists()) { - int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Shall I overwrite that file?").arg(fileName), + int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Shall I overwrite that file?").tqarg(fileName), i18n("Overwrite File"), i18n("Overwrite")); if (r == KMessageBox::Cancel) return; @@ -216,7 +216,7 @@ bool KMultiPage::closeURL() // Clear Table of Contents tableOfContents->clear(); - // Clear Status Bar + // Clear tqStatus Bar emit setStatusBarText(TQString()); return true; @@ -767,7 +767,7 @@ void KMultiPage::print() return; // initialize the printer using the print dialog - if ( printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1))) ) { + if ( printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) { // Now do the printing. TQValueList pageList = printer->pageList(); if (pageList.isEmpty()) @@ -1427,7 +1427,7 @@ void KMultiPage::findNextText() if (i != 0) { - setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages())); + setStatusBarText(i18n("Search page %1 of %2").tqarg(pageNumber).tqarg(numberOfPages())); kapp->processEvents(); } @@ -1474,7 +1474,7 @@ void KMultiPage::findNextText() int answ = KMessageBox::questionYesNo(scrollView(), i18n("The search string %1 could not be found by the " "end of the document. Should the search be restarted from the beginning " - "of the document?").arg(searchText), + "of the document?").tqarg(searchText), i18n("Text Not Found"), KStdGuiItem::cont(), KStdGuiItem::cancel()); if (answ != KMessageBox::Yes) @@ -1499,7 +1499,7 @@ void KMultiPage::findNextText() } } - KMessageBox::sorry(scrollView(), i18n("The search string %1 could not be found.").arg(searchText)); + KMessageBox::sorry(scrollView(), i18n("The search string %1 could not be found.").tqarg(searchText)); setStatusBarText(TQString()); searchInProgress = false; if (!cachedPage) @@ -1569,7 +1569,7 @@ void KMultiPage::findPrevText() if (i != 0) { - setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages())); + setStatusBarText(i18n("Search page %1 of %2").tqarg(pageNumber).tqarg(numberOfPages())); kapp->processEvents(); } @@ -1616,7 +1616,7 @@ void KMultiPage::findPrevText() int answ = KMessageBox::questionYesNo(scrollView(), i18n("The search string %1 could not be found by the " "beginning of the document. Should the search be restarted from the end " - "of the document?").arg(searchText), + "of the document?").tqarg(searchText), i18n("Text Not Found"), KStdGuiItem::cont(), KStdGuiItem::cancel()); if (answ != KMessageBox::Yes) @@ -1641,7 +1641,7 @@ void KMultiPage::findPrevText() } } - KMessageBox::sorry(scrollView(), i18n("The search string %1 could not be found.").arg(searchText)); + KMessageBox::sorry(scrollView(), i18n("The search string %1 could not be found.").tqarg(searchText)); setStatusBarText(TQString()); searchInProgress = false; if (!cachedPage) @@ -1710,7 +1710,7 @@ void KMultiPage::reload() pageCache->clear(); pageCache->deselectText(); document_history.clear(); - emit setStatusBarText(i18n("Reloading file %1").arg(m_file)); + emit setStatusBarText(i18n("Reloading file %1").tqarg(m_file)); TQ_INT32 pg = currentPageNumber(); killTimer(timer_id); @@ -1746,7 +1746,7 @@ bool KMultiPage::openFile() pageCache->deselectText(); document_history.clear(); pageCache->clear(); - emit setStatusBarText(i18n("Loading file %1").arg(m_file)); + emit setStatusBarText(i18n("Loading file %1").tqarg(m_file)); bool r = renderer->setFile(m_file, m_url); @@ -1887,9 +1887,9 @@ KPrinter *KMultiPage::getPrinter(bool enablePageSizeFeatures) } else it++; if (endval == val) - range += TQString("%1").arg(val); + range += TQString("%1").tqarg(val); else - range += TQString("%1-%2").arg(val).arg(endval); + range += TQString("%1-%2").tqarg(val).tqarg(endval); } while (it != selectedPageNo.end() ); printer->setOption( "kde-range", range ); } @@ -1912,7 +1912,7 @@ void KMultiPage::doExportText() if (finfo.exists()) { int r = KMessageBox::warningContinueCancel (scrollView(), - i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName), + i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName), i18n("Overwrite File"), i18n("Overwrite")); if (r == KMessageBox::Cancel) -- cgit v1.2.1