From 955e20356d63ed405198c8143617a8a0ca8bfc02 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:17 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit bf280726d5d22f33d33e4f9e771220c725249407. --- kjots/CHANGES | 10 +++++----- kjots/KJotsMain.cpp | 16 ++++++++-------- kjots/KJotsMain.h | 2 +- kjots/confpagemisc.ui | 6 +++--- kjots/kjotsedit.cpp | 2 +- kjots/kjotsentry.cpp | 30 +++++++++++++++--------------- 6 files changed, 33 insertions(+), 33 deletions(-) (limited to 'kjots') diff --git a/kjots/CHANGES b/kjots/CHANGES index 9815d90..a4cc4ff 100644 --- a/kjots/CHANGES +++ b/kjots/CHANGES @@ -15,12 +15,12 @@ new in version 0.5 (Aaron J. Seigo) new in version 0.4 (Mario Weilguni ) - works now with Qt 2.0 -- fixed broken layout of main window -- layout improvements in AskFileName() -- layout improvements in SubjList() +- fixed broken tqlayout of main window +- tqlayout improvements in AskFileName() +- tqlayout improvements in SubjList() - compiles without warnings - "Apply" button is only activated when changes were made -- improved layout of configuration dialog +- improved tqlayout of configuration dialog - fixed a bug in the font selection - now compiles with EGCS ( Robert Williams ) @@ -59,7 +59,7 @@ new in version 0.2.1 new in version 0.2.0 -- changed the layout to be more KDE conforming (toolbar, statusbar,...) +- changed the tqlayout to be more KDE conforming (toolbar, statusbar,...) - folders are now called books and entries are pages - added subject to each page - you may popup a window with a list of all subjects and use it to find diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index f2dfa97..2feb47a 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -72,7 +72,7 @@ KJotsMain::KJotsMain(const char* name) // the subject list subjectList = new KListView(splitter, "subjectList"); subjectList->setRootIsDecorated(true); - subjectList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); + subjectList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); subjectList->setMinimumWidth(subjectList->fontMetrics().maxWidth() * 10 + 5); subjectList->addColumn(i18n("Pages")); subjectList->setFullWidth(true); @@ -101,7 +101,7 @@ KJotsMain::KJotsMain(const char* name) TQVBoxLayout *bookGrid = new TQVBoxLayout(f_main, KDialog::marginHint(), KDialog::spacingHint()); bookGrid->addWidget(splitter, 0, 0); bookGrid->setMargin(0); - splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1)); + splitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1)); // create actions actions[ACTION_NEXT_BOOK] = new KAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this), @@ -316,7 +316,7 @@ void KJotsMain::deleteBook() return; TQString msg = i18n("Are you sure you want to delete the %1 book?"); - int result = KMessageBox::warningContinueCancel(topLevelWidget(), msg.arg(b->subject()), i18n("Delete Book"),KStdGuiItem::del()); + int result = KMessageBox::warningContinueCancel(tqtopLevelWidget(), msg.tqarg(b->subject()), i18n("Delete Book"),KStdGuiItem::del()); if (result!=KMessageBox::Continue) return; @@ -358,9 +358,9 @@ void KJotsMain::deleteEntry() KJotsPage* cur = currentPage(); if (!cur || - KMessageBox::warningContinueCancel(topLevelWidget(), + KMessageBox::warningContinueCancel(tqtopLevelWidget(), i18n("Are you sure you want to delete the %1 page?") - .arg(cur->subject()), + .tqarg(cur->subject()), i18n("Delete Page"),KStdGuiItem::del()) != KMessageBox::Continue) { return; @@ -493,7 +493,7 @@ void KJotsMain::saveBookToFile(bool plainText) } if (!KIO::NetAccess::exists(res.URLs[0], true, this) || - KMessageBox::warningYesNo(this, "" + i18n("The file %1 already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) + KMessageBox::warningYesNo(this, "" + i18n("The file %1 already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) { tryAgain = false; } @@ -534,7 +534,7 @@ void KJotsMain::savePageToFile(bool plainText) } if (!KIO::NetAccess::exists(res.URLs[0], true, this) || - KMessageBox::warningYesNo(this, "" + i18n("The file %1 already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) + KMessageBox::warningYesNo(this, "" + i18n("The file %1 already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) { tryAgain = false; } @@ -573,7 +573,7 @@ void KJotsMain::slotQuit() void KJotsMain::insertDate() { - me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " "); + me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(), true) + " "); } void KJotsMain::updateMenu() diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h index 1285f06..61c830b 100644 --- a/kjots/KJotsMain.h +++ b/kjots/KJotsMain.h @@ -23,7 +23,7 @@ #ifndef KJotsMain_included #define KJotsMain_included -#include +#include #include #include diff --git a/kjots/confpagemisc.ui b/kjots/confpagemisc.ui index f717a48..4a45efb 100644 --- a/kjots/confpagemisc.ui +++ b/kjots/confpagemisc.ui @@ -66,7 +66,7 @@ Expanding - + 40 20 @@ -83,7 +83,7 @@ Expanding - + 20 30 @@ -100,7 +100,7 @@ Fixed - + 20 20 diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index 643fd92..eff6cba 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -135,7 +135,7 @@ void KJotsEdit::setEntry (KJotsPage *entry) m_entry = entry; setText(entry->body()); removeSelection(); - repaint(); + tqrepaint(); setEnabled(true); setFocus(); entry->setEditor(this); diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index fa35c86..53613c3 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -532,9 +532,9 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding) //revisions will likely use it. I don't want to make the translators add, remove, //and re-add translations, so I'm just keeping this here for now. m_saveProgressDialog = new KProgressDialog(listView(), "bookSaveInProgress", - i18n("Saving %1").arg(subject()), + i18n("Saving %1").tqarg(subject()), i18n("Saving the contents of %1 to %2") - .arg(subject(), url.prettyURL()), + .tqarg(subject(), url.prettyURL()), true); m_saveProgressDialog->progressBar()->setTotalSteps(1); @@ -613,7 +613,7 @@ void KJotsBook::print(TQFont& defaultFont) printer.setFullPage(false); printer.setCreator("KJots"); - if (!printer.setup(listView(), i18n("Print: %1").arg(subject()))) + if (!printer.setup(listView(), i18n("Print: %1").tqarg(subject()))) { return; } @@ -657,7 +657,7 @@ bool KJotsBook::isDirty() //Am I dirty? if ( KJotsEntryBase::isDirty() ) return true; - //Check all children to see if any of them are dirty + //Check all tqchildren to see if any of them are dirty KJotsEntryBase *entry = dynamic_cast(firstChild()); while ( entry ) { @@ -763,7 +763,7 @@ TQString KJotsBook::getToc() KJotsEntryBase *entry = dynamic_cast(firstChild()); while ( entry ) { TQString htmlSubject = prepForHTML(entry->subject()); - toc += TQString("
  • ").arg(entry->id()) + htmlSubject + "
    • "; + toc += TQString("
  • ").tqarg(entry->id()) + htmlSubject + "
    • "; KJotsBook *book = dynamic_cast(entry); if ( book ) toc += book->getToc(); @@ -787,13 +787,13 @@ TQString KJotsBook::generateHtml( KJotsEntryBase* top, bool diskMode ) if ( top == this ) { - toc = TQString("

    %2

    ").arg(id()).arg(htmlTitle); + toc = TQString("

    %2

    ").tqarg(id()).tqarg(htmlTitle); } else { if ( diskMode ) { - toc = TQString("

    %2

    ").arg(id()).arg(htmlTitle); + toc = TQString("

    %2

    ").tqarg(id()).tqarg(htmlTitle); } else { - toc = TQString("

    %3

    ").arg(id()).arg(id()).arg(htmlTitle); + toc = TQString("

    %3

    ").tqarg(id()).tqarg(id()).tqarg(htmlTitle); } } @@ -995,7 +995,7 @@ void KJotsPage::print(TQFont& defaultFont) printer.setFullPage(false); printer.setCreator("KJots"); - if (printer.setup(listView(), i18n("Print: %1").arg(docName))) + if (printer.setup(listView(), i18n("Print: %1").tqarg(docName))) { TQPainter painter( &printer ); painter.setFont(defaultFont); @@ -1066,7 +1066,7 @@ TQString KJotsPage::defaultSubject() page = 1; } - return i18n("Page %1").arg(page); + return i18n("Page %1").tqarg(page); } /*! @@ -1181,21 +1181,21 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode ) TQString htmlSubject = prepForHTML(subject()); if ( top == this || diskMode ) { - html += TQString("

    %2

    ").arg(id()).arg(htmlSubject); + html += TQString("

    %2

    ").tqarg(id()).tqarg(htmlSubject); } else { - html += TQString("

    %3

    ").arg(id()).arg(id()).arg(htmlSubject); + html += TQString("

    %3

    ").tqarg(id()).tqarg(id()).tqarg(htmlSubject); } html += prepForHTML(body()); html += "
    "; - html += TQString("").arg(id()).arg(subject()); + html += TQString("").tqarg(id()).tqarg(subject()); if ( top != this ) { KJotsBook *parent = parentBook(); while ( parent ) { - html += TQString("").arg(parent->id()).arg(parent->subject()); + html += TQString("").tqarg(parent->id()).tqarg(parent->subject()); if ( parent == top ) break; parent = parent->parentBook(); } -- cgit v1.2.1
    %2%2%2%2