From 1fffbdafa12271a1a635caf46777fb8acfb6f31b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:36 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076. --- quanta/dialogs/actionconfigdialog.cpp | 10 +++++----- quanta/dialogs/actionconfigdialogs.ui | 22 +++++++++++----------- quanta/dialogs/casewidget.ui | 2 +- quanta/dialogs/debuggeroptionss.ui | 6 +++--- quanta/dialogs/dirtydialog.ui | 6 +++--- quanta/dialogs/dirtydlg.cpp | 2 +- quanta/dialogs/donationdialog.ui | 6 +++--- quanta/dialogs/dtdselectdialog.ui | 4 ++-- quanta/dialogs/dtepeditdlg.cpp | 24 ++++++++++++------------ quanta/dialogs/dtepeditdlgs.ui | 16 ++++++++-------- quanta/dialogs/dtepstructureeditdlgs.ui | 10 +++++----- quanta/dialogs/filecombo.cpp | 14 +++++++------- quanta/dialogs/fourbuttonmessagebox.ui | 8 ++++---- quanta/dialogs/loadentitydlgs.ui | 2 +- quanta/dialogs/settings/abbreviation.cpp | 10 +++++----- quanta/dialogs/settings/abbreviations.ui | 4 ++-- quanta/dialogs/settings/codetemplatedlgs.ui | 2 +- quanta/dialogs/settings/filemaskss.ui | 20 ++++++++++---------- quanta/dialogs/settings/parseroptionsui.ui | 8 ++++---- quanta/dialogs/settings/previewoptions.cpp | 12 ++++++------ quanta/dialogs/settings/previewoptions.h | 2 +- quanta/dialogs/settings/previewoptionss.ui | 6 +++--- quanta/dialogs/settings/styleoptionss.ui | 8 ++++---- quanta/dialogs/specialchardialog.cpp | 2 +- quanta/dialogs/specialchardialogs.ui | 12 ++++++------ quanta/dialogs/tagdialogs/colorcombo.cpp | 4 ++-- quanta/dialogs/tagdialogs/colorcombo.h | 2 +- quanta/dialogs/tagdialogs/listdlg.cpp | 2 +- quanta/dialogs/tagdialogs/pictureview.cpp | 2 +- quanta/dialogs/tagdialogs/tagattr.cpp | 2 +- quanta/dialogs/tagdialogs/tagdialog.cpp | 6 +++--- quanta/dialogs/tagdialogs/tagimgdlgdata.cpp | 2 +- quanta/dialogs/tagdialogs/tagmail.ui | 4 ++-- quanta/dialogs/tagdialogs/tagmisc.ui | 2 +- quanta/dialogs/tagdialogs/tagxml.cpp | 2 +- 35 files changed, 123 insertions(+), 123 deletions(-) (limited to 'quanta/dialogs') diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index d8e44d45..d5cace16 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -190,7 +190,7 @@ void ActionConfigDialog::slotRemoveToolbar() } if (s != i18n("All")) { - if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").tqarg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); @@ -682,7 +682,7 @@ void ActionConfigDialog::saveCurrentAction() p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->instance()); } TQWidget *toolBar = tb->page(i); - if (toolBar->minimumSizeHint().height() > 20) + if (toolBar->tqminimumSizeHint().height() > 20) { toolBar->adjustSize(); toolBar->setGeometry(0,0, tb->width(), toolBar->height()); @@ -765,7 +765,7 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) TQString s = i18n("The '%1' key combination has already been allocated " "to the \"%2\" action.\n" "Please choose a unique key combination."). - arg(shortcutText).arg(global); + tqarg(shortcutText).tqarg(global); KMessageBox::sorry( this, s, i18n("Conflicting Shortcuts")); } } @@ -805,7 +805,7 @@ void ActionConfigDialog::slotNewAction() static_cast(currentAction)->setModified(true); TQListViewItem *currentItem = actionTreeView->currentItem(); TQListViewItem *item = new KListViewItem(allActionsItem); - TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count()); + TQString actionText = TQString("Action_%1").tqarg(m_mainWindow->actionCollection()->count()); currentAction->setText(actionText); item->setText(2, currentAction->name()); item->setText(0, actionText); @@ -838,7 +838,7 @@ void ActionConfigDialog::slotNewAction() void ActionConfigDialog::slotDeleteAction() { - if ( KMessageBox::warningContinueCancel(this, i18n("Removing the action removes all the references to it.\nAre you sure you want to remove the %1 action?").arg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Removing the action removes all the references to it.\nAre you sure you want to remove the %1 action?").tqarg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { TQString actionName = currentAction->name(); emit deleteUserAction(currentAction); diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index fba7eaf9..d834bea7 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -39,7 +39,7 @@ - layout17 + tqlayout17 @@ -77,7 +77,7 @@ Expanding - + 16 20 @@ -94,7 +94,7 @@ Fixed - + 16 20 @@ -160,7 +160,7 @@ - layout9 + tqlayout9 @@ -198,7 +198,7 @@ Fixed - + 16 20 @@ -209,7 +209,7 @@ buttonOk - + 90 0 @@ -265,7 +265,7 @@ Fixed - + 16 20 @@ -311,13 +311,13 @@ 0 - + 32 32 - + 32 32 @@ -521,7 +521,7 @@ 0 - + 64 20 @@ -740,7 +740,7 @@ Expanding - + 55 20 diff --git a/quanta/dialogs/casewidget.ui b/quanta/dialogs/casewidget.ui index 6670afb0..f3370603 100644 --- a/quanta/dialogs/casewidget.ui +++ b/quanta/dialogs/casewidget.ui @@ -12,7 +12,7 @@ 158 - + 500 100 diff --git a/quanta/dialogs/debuggeroptionss.ui b/quanta/dialogs/debuggeroptionss.ui index 597fbcd6..3bca0951 100644 --- a/quanta/dialogs/debuggeroptionss.ui +++ b/quanta/dialogs/debuggeroptionss.ui @@ -20,7 +20,7 @@ 0 - + 350 220 @@ -101,7 +101,7 @@ Expanding - + 20 20 @@ -120,7 +120,7 @@ Expanding - + 20 20 diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui index b5331bb1..50783723 100644 --- a/quanta/dialogs/dirtydialog.ui +++ b/quanta/dialogs/dirtydialog.ui @@ -29,7 +29,7 @@ 0 - + 400 220 @@ -106,7 +106,7 @@ (If you later save the document, you will lose what was on the disk.) - + WordBreak|AlignVCenter @@ -120,7 +120,7 @@ Fixed - + 20 20 diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 70d06c86..972c4828 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -41,7 +41,7 @@ DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool creat m_busy = false; m_createBackup = createBackup; m_mainWidget = new DirtyDialog(this); - m_mainWidget->textLabel->setText(i18n("The file %1 was changed outside of the Quanta editor.").arg(srcName)); + m_mainWidget->textLabel->setText(i18n("The file %1 was changed outside of the Quanta editor.").tqarg(srcName)); setMainWidget(m_mainWidget); } diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui index ca0135df..c06a9c2f 100644 --- a/quanta/dialogs/donationdialog.ui +++ b/quanta/dialogs/donationdialog.ui @@ -86,7 +86,7 @@ is the future of software, but it is no guarantee of success. How many open sour Expanding - + 365 20 @@ -108,13 +108,13 @@ is the future of software, but it is no guarantee of success. How many open sour 0 - + 0 30 - + 32767 40 diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui index cd6a079b..b2455cf7 100644 --- a/quanta/dialogs/dtdselectdialog.ui +++ b/quanta/dialogs/dtdselectdialog.ui @@ -21,7 +21,7 @@ 161 - + 440 160 @@ -45,7 +45,7 @@ Dialog message2: true - + WordBreak|AlignVCenter diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index c2595716..28f00ce3 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -113,9 +113,9 @@ void DTEPEditDlg::readGeneral() void DTEPEditDlg::readPages() { int i = 1; - while (m_config->hasGroup(TQString("Page%1").arg(i)) && i < 6) + while (m_config->hasGroup(TQString("Page%1").tqarg(i)) && i < 6) { - m_config->setGroup(TQString("Page%1").arg(i)); + m_config->setGroup(TQString("Page%1").tqarg(i)); TQString title = m_config->readEntry("Title"); TQString groups = m_config->readEntry("Groups"); if (i == 1) @@ -203,7 +203,7 @@ void DTEPEditDlg::saveResult() { if (f.exists()) { - if (KMessageBox::questionYesNo(this, i18n("The file %1 is not writable.
Do you want to save the configuration to a different file?").arg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("The file %1 is not writable.
Do you want to save the configuration to a different file?").tqarg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) { targetFile = KFileDialog::getSaveFileName(locateLocal("data", resourceDir + "dtep/description.rc"), i18n("*.rc|DTEP Description"), this, i18n("Save Description As")); } else @@ -255,35 +255,35 @@ void DTEPEditDlg::writePages(KConfig *config) if (enablePage1->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit1->text()); writeEntry(config, "Groups", groupsEdit1->text()); } if (enablePage2->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit2->text()); writeEntry(config, "Groups", groupsEdit2->text()); } if (enablePage3->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit3->text()); writeEntry(config, "Groups", groupsEdit3->text()); } if (enablePage4->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit4->text()); writeEntry(config, "Groups", groupsEdit4->text()); } if (enablePage5->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit5->text()); writeEntry(config, "Groups", groupsEdit5->text()); } @@ -343,10 +343,10 @@ void DTEPEditDlg::readStructures() int objectGroupId = m_config->readNumEntry("ObjectGroupIndex", -1); int i = 1; - while (m_config->hasGroup(TQString("StructGroup_%1").arg(i))) + while (m_config->hasGroup(TQString("StructGroup_%1").tqarg(i))) { StructGroup group; - m_config->setGroup(TQString("StructGroup_%1").arg(i)); + m_config->setGroup(TQString("StructGroup_%1").tqarg(i)); group.name = m_config->readEntry("Name"); group.noName = m_config->readEntry("No_Name"); group.icon = m_config->readEntry("Icon"); @@ -387,7 +387,7 @@ void DTEPEditDlg::writeStructures(KConfig *config) for (TQValueList::ConstIterator it = m_structGroups.constBegin(); it != m_structGroups.constEnd(); ++it) { StructGroup group = *it; - config->setGroup(TQString("StructGroup_%1").arg(i)); + config->setGroup(TQString("StructGroup_%1").tqarg(i)); writeEntry(config, "Name", group.name); writeEntry(config, "No_Name", group.noName); writeEntry(config, "Icon", group.icon); @@ -536,7 +536,7 @@ void DTEPEditDlg::slotDeleteStructGroup() int currentItem = structuresList->currentItem(); if (currentItem != -1) { - if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the %1 group?").arg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the %1 group?").tqarg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) { m_structGroups.remove(m_structGroups.at(currentItem)); structuresList->removeItem(currentItem); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index e0d29eae..ef7e47c7 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -103,7 +103,7 @@ Expanding - + 40 20 @@ -158,7 +158,7 @@ Expanding - + 20 50 @@ -505,7 +505,7 @@ Expanding - + 40 20 @@ -535,7 +535,7 @@ Expanding - + 20 50 @@ -1069,7 +1069,7 @@ See the <b>True</b> and <b>False</b> boxes to define the False: - + AlignVCenter|AlignRight @@ -1083,7 +1083,7 @@ See the <b>True</b> and <b>False</b> boxes to define the True: - + AlignVCenter|AlignRight @@ -1097,7 +1097,7 @@ See the <b>True</b> and <b>False</b> boxes to define the Expanding - + 40 20 @@ -1647,7 +1647,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> Expanding - + 20 270 diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index 802f6753..059c783d 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -57,7 +57,7 @@ &Icon: - + AlignVCenter|AlignRight @@ -76,13 +76,13 @@ 0 - + 50 50 - + 50 50 @@ -206,7 +206,7 @@ Fixed - + 20 16 @@ -482,7 +482,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& Expanding - + 340 20 diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 848814f3..636559ce 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ // QT includes -#include +#include #include #include @@ -35,7 +35,7 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) baseURL = a_baseURL; m_absolutePath = false; - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); combo->setEditable(true); @@ -44,8 +44,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - layout ->addWidget( combo ); - layout ->addWidget( button ); + tqlayout ->addWidget( combo ); + tqlayout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); @@ -58,7 +58,7 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) { baseURL.setPath("."); - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); button = new TQPushButton(this); @@ -66,8 +66,8 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - layout ->addWidget( combo ); - layout ->addWidget( button ); + tqlayout ->addWidget( combo ); + tqlayout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui index ec85fa91..e5066449 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -21,7 +21,7 @@ 150 - + 0 150 @@ -35,7 +35,7 @@ pixmapLabel - + 32 32 @@ -52,7 +52,7 @@ - layout2 + tqlayout2 @@ -110,7 +110,7 @@ Fixed - + 20 16 diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui index 10950ae7..007fbba4 100644 --- a/quanta/dialogs/loadentitydlgs.ui +++ b/quanta/dialogs/loadentitydlgs.ui @@ -59,7 +59,7 @@ Expanding - + 20 40 diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index bfaae460..46805d0e 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include //kde includes @@ -97,7 +97,7 @@ void AbbreviationDlg::slotNewGroup() { if (qConfig.abbreviations.contains(groupName)) { - KMessageBox::error(this, i18n("There is already an abbreviation group called %1. Choose an unique name for the new group.").arg(groupName), i18n("Group already exists")); + KMessageBox::error(this, i18n("There is already an abbreviation group called %1. Choose an unique name for the new group.").tqarg(groupName), i18n("Group already exists")); TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); } else { @@ -187,7 +187,7 @@ void AbbreviationDlg::slotRemoveTemplate() { TQListViewItem *item = templatesList->currentItem(); if (item && - KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 template?").arg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) + KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 template?").tqarg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) { m_currentAbbrev->abbreviations.remove(item->text(0)+" "+item->text(1)); delete item; @@ -270,7 +270,7 @@ void AbbreviationDlg::saveTemplates() f.close(); } else { - KMessageBox::error(this, i18n("Cannot open the file %1 for writing.\nModified abbreviations will be lost when you quit Quanta.").arg(s)); + KMessageBox::error(this, i18n("Cannot open the file %1 for writing.\nModified abbreviations will be lost when you quit Quanta.").tqarg(s)); } } diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index b73e902b..0c9c232a 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -170,7 +170,7 @@ Preferred - + 20 30 @@ -255,7 +255,7 @@ Expanding - + 20 40 diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 7a1367b9..82d1976f 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -21,7 +21,7 @@ 72 - + 400 70 diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index 7fe28ce1..e4c408d3 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -29,7 +29,7 @@ 0 - + 0 0 @@ -73,7 +73,7 @@ lineMarkup - + AlignLeft @@ -81,7 +81,7 @@ lineImage - + AlignLeft @@ -130,7 +130,7 @@ lineText - + AlignLeft @@ -146,7 +146,7 @@ 0 - + 0 0 @@ -172,7 +172,7 @@ Expanding - + 153 20 @@ -183,7 +183,7 @@ lineScript - + AlignLeft @@ -196,7 +196,7 @@ Default character &encoding: - + AlignVCenter|AlignLeft @@ -224,7 +224,7 @@ Expanding - + 20 50 @@ -270,7 +270,7 @@ - layout2 + tqlayout2 diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui index 14095623..2637e71d 100644 --- a/quanta/dialogs/settings/parseroptionsui.ui +++ b/quanta/dialogs/settings/parseroptionsui.ui @@ -29,7 +29,7 @@ 0 - + 0 0 @@ -74,7 +74,7 @@ Expanding - + 122 20 @@ -102,7 +102,7 @@ Expanding - + 122 20 @@ -282,7 +282,7 @@ Expanding - + 20 40 diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp index 2df03ea9..e1df2225 100644 --- a/quanta/dialogs/settings/previewoptions.cpp +++ b/quanta/dialogs/settings/previewoptions.cpp @@ -31,9 +31,9 @@ PreviewOptions::PreviewOptions(TQWidget *parent, const char *name) PreviewOptions::~PreviewOptions(){ } -void PreviewOptions::setWindowLayout(const TQString& layout ) +void PreviewOptions::setWindowLayout(const TQString& tqlayout ) { - if ( layout == "Default") resetLayout->setChecked(true); + if ( tqlayout == "Default") resetLayout->setChecked(true); else resetLayout->setChecked(false); } @@ -64,12 +64,12 @@ TQString PreviewOptions::docPosition() return position; } -TQString PreviewOptions::layout() +TQString PreviewOptions::tqlayout() { - TQString layout = "Custom"; + TQString tqlayout = "Custom"; if ( resetLayout->isChecked() ) - layout = "Default"; - return layout; + tqlayout = "Default"; + return tqlayout; } TQString PreviewOptions::closeButtons() diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index a3cce15e..24f1a765 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -30,7 +30,7 @@ public: ~PreviewOptions(); TQString position(); - TQString layout(); + TQString tqlayout(); TQString closeButtons(); TQString docPosition(); uint toolviewTabs(); diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui index 821cdfcc..02bdc979 100644 --- a/quanta/dialogs/settings/previewoptionss.ui +++ b/quanta/dialogs/settings/previewoptionss.ui @@ -21,7 +21,7 @@ 512 - + 350 220 @@ -36,7 +36,7 @@ resetLayout - Reset window layout to the default on the next startup + Reset window tqlayout to the default on the next startup @@ -215,7 +215,7 @@ Expanding - + 20 30 diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui index 397c99af..e14cfda6 100644 --- a/quanta/dialogs/settings/styleoptionss.ui +++ b/quanta/dialogs/settings/styleoptionss.ui @@ -29,7 +29,7 @@ 0 - + 410 250 @@ -144,7 +144,7 @@ Expanding - + 20 30 @@ -183,8 +183,8 @@ Automatic &replacement of the accented characters - If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their unicode style notation, for the above case with <b>&#038;#225;</b>.<br> -We suggest to leave this option off and use an unicode or locale encoding for your documents. + If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their tqunicode style notation, for the above case with <b>&#038;#225;</b>.<br> +We suggest to leave this option off and use an tqunicode or locale encoding for your documents. diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index 01cb53ad..23c372e1 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index d29bd1ba..e45807c8 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -24,7 +24,7 @@ - layout4 + tqlayout4 @@ -34,7 +34,7 @@ buttonOk - + 100 0 @@ -54,7 +54,7 @@ buttonChar - + 100 0 @@ -74,7 +74,7 @@ Expanding - + 112 20 @@ -85,7 +85,7 @@ buttonCancel - + 100 0 @@ -105,7 +105,7 @@ - layout3 + tqlayout3 diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index cc0fa2fc..b3af1391 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -24,7 +24,7 @@ // KColorDialog::getColor() so that in contains a parent argument. This // improves centering capability. // -// layout management added Oct 1997 by Mario Weilguni +// tqlayout management added Oct 1997 by Mario Weilguni // // @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index ac7ed429..398ddca4 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -19,7 +19,7 @@ //----------------------------------------------------------------------------- // KDE color selection combo box -// layout management added Oct 1997 by Mario Weilguni +// tqlayout management added Oct 1997 by Mario Weilguni // diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index 713ccf2c..0d6de8ed 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -40,7 +40,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) } listbox->setMinimumSize(350,150); adjustSize(); - resize(sizeHint()); + resize(tqsizeHint()); connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); } diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp index 65102ba8..07123b7c 100644 --- a/quanta/dialogs/tagdialogs/pictureview.cpp +++ b/quanta/dialogs/tagdialogs/pictureview.cpp @@ -69,7 +69,7 @@ void PictureView::slotSetImage(const TQString& file) picheight = pix->height(); scale(); - repaint(); + tqrepaint(); } /** try scale image */ diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp index 8103db31..08e4a42d 100644 --- a/quanta/dialogs/tagdialogs/tagattr.cpp +++ b/quanta/dialogs/tagdialogs/tagattr.cpp @@ -24,7 +24,7 @@ //qt includes #include -#include +#include //app includes #include "tagattr.h" diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 93ced2c5..ac9c8ffc 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -179,7 +179,7 @@ void TagDialog::parseTag() else { TQString docString = "\n\n"; - docString += TQString("\n").arg(dtdTag->name()); + docString += TQString("\n").tqarg(dtdTag->name()); docString += QuantaCommon::xmlFromAttributes(dtdTag->attributes()); docString += "\n\n"; doc.setContent(docString); @@ -200,14 +200,14 @@ void TagDialog::parseTag() for (int i = 1; i <= numOfPages; i++) { Tagxml *extraPage = 0L; - dtdConfig->setGroup(TQString("Page%1").arg(i)); + dtdConfig->setGroup(TQString("Page%1").tqarg(i)); TQString title = dtdConfig->readEntry("Title"); TQStringList groupList; groupList = dtdConfig->readListEntry("Groups"); TQDomDocument extraDoc; //build an internal tag XML for the groups bool addPage = false; TQString docString = "\n\n"; - docString += TQString("\n").arg(i); + docString += TQString("\n").tqarg(i); for (uint j = 0; j < groupList.count(); j++) { groupList[j] = groupList[j].stripWhiteSpace(); diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp index 8639a16f..a761d62c 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include "pictureview.h" diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui index e7a71fa1..84be37bc 100644 --- a/quanta/dialogs/tagdialogs/tagmail.ui +++ b/quanta/dialogs/tagdialogs/tagmail.ui @@ -39,7 +39,7 @@ 0 - + 32 32767 @@ -117,7 +117,7 @@ Expanding - + 40 20 diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui index f4842d4c..24db77c7 100644 --- a/quanta/dialogs/tagdialogs/tagmisc.ui +++ b/quanta/dialogs/tagdialogs/tagmisc.ui @@ -21,7 +21,7 @@ 61 - + 350 60 diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 8a69d647..2b126d26 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.1