From e985f7e545f4739493965aad69bbecb136dc9346 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 16 Jun 2011 19:02:47 +0000 Subject: TQt4 port kdewebdev This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- quanta/dialogs/settings/abbreviation.cpp | 18 ++++---- quanta/dialogs/settings/abbreviation.h | 3 +- quanta/dialogs/settings/abbreviations.ui | 38 ++++++++-------- quanta/dialogs/settings/codetemplatedlgs.ui | 18 ++++---- quanta/dialogs/settings/filemasks.cpp | 14 +++--- quanta/dialogs/settings/filemasks.h | 5 ++- quanta/dialogs/settings/filemaskss.ui | 70 ++++++++++++++--------------- quanta/dialogs/settings/parseroptions.cpp | 8 ++-- quanta/dialogs/settings/parseroptions.h | 3 +- quanta/dialogs/settings/parseroptionsui.ui | 46 +++++++++---------- quanta/dialogs/settings/previewoptions.cpp | 16 +++---- quanta/dialogs/settings/previewoptions.h | 5 ++- quanta/dialogs/settings/previewoptionss.ui | 52 ++++++++++----------- quanta/dialogs/settings/styleoptionss.ui | 34 +++++++------- 14 files changed, 167 insertions(+), 163 deletions(-) (limited to 'quanta/dialogs/settings') diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 79dc4bc1..1f1728ae 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -41,8 +41,8 @@ #include "dtds.h" -AbbreviationDlg::AbbreviationDlg(TQWidget *parent, const char *name): - AbbreviationDlgS(parent, name) +AbbreviationDlg::AbbreviationDlg(TQWidget *tqparent, const char *name): + AbbreviationDlgS(tqparent, name) { m_oldItem = 0L; m_currentAbbrev = 0L; @@ -76,8 +76,8 @@ void AbbreviationDlg::slotGroupChanged(const TQString& newGroupName) for ( it = m_currentAbbrev->abbreviations.constBegin(); it != m_currentAbbrev->abbreviations.constEnd(); ++it ) { templateStr = it.key(); - templateName = templateStr.mid(templateStr.find(' ') + 1); - templateStr = templateStr.left(templateStr.find(' ')); + templateName = templateStr.mid(templateStr.tqfind(' ') + 1); + templateStr = templateStr.left(templateStr.tqfind(' ')); new KListViewItem(templatesList, templateStr, templateName); } for ( TQStringList::ConstIterator dtepit = m_currentAbbrev->dteps.constBegin(); dtepit != m_currentAbbrev->dteps.constEnd(); ++dtepit ) @@ -95,9 +95,9 @@ void AbbreviationDlg::slotNewGroup() TQString groupName = KInputDialog::getText(i18n("New Abbreviation Group"), i18n("Group name:"), "", &ok, this); if (ok && !groupName.isEmpty()) { - if (qConfig.abbreviations.contains(groupName)) + if (qConfig.abbreviations.tqcontains(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::null,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; @@ -248,7 +248,7 @@ void AbbreviationDlg::saveTemplates() el.setAttribute("code", it.data()); s = it.key(); s2 = ""; - pos = s.find(' '); + pos = s.tqfind(' '); if (pos != -1) { s2 = s.mid(pos+1); @@ -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/abbreviation.h b/quanta/dialogs/settings/abbreviation.h index d2ba7ea6..949ad663 100644 --- a/quanta/dialogs/settings/abbreviation.h +++ b/quanta/dialogs/settings/abbreviation.h @@ -27,8 +27,9 @@ struct DTDStruct; class AbbreviationDlg : public AbbreviationDlgS { Q_OBJECT + TQ_OBJECT public: - AbbreviationDlg(TQWidget *parent, const char *name = 0); + AbbreviationDlg(TQWidget *tqparent, const char *name = 0); ~AbbreviationDlg(); void saveTemplates(); diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index 9274fdc6..8e115d0f 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2003 Andras Mantia <amantia@kde.org> - + AbbreviationDlgS @@ -52,7 +52,7 @@ &New... - + textLabel1_2 @@ -71,7 +71,7 @@ groupCombo - + textLabel1 @@ -103,7 +103,7 @@ - + codeEdit @@ -152,7 +152,7 @@ true - + addButton @@ -170,14 +170,14 @@ Preferred - + 20 30 - + removeButton @@ -185,7 +185,7 @@ &Remove - + editButton @@ -193,7 +193,7 @@ &Edit... - + textLabel2 @@ -210,7 +210,7 @@ codeEdit - + textLabel3 @@ -255,7 +255,7 @@ Expanding - + 20 40 @@ -269,9 +269,9 @@ templatesList - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) AbbreviationDlgS - slotTemplateSelectionChanged(QListViewItem*) + slotTemplateSelectionChanged(TQListViewItem*) addButton @@ -317,7 +317,7 @@ templatesList - doubleClicked(QListViewItem*) + doubleClicked(TQListViewItem*) AbbreviationDlgS slotEditTemplate() @@ -334,19 +334,19 @@ editButton codeEdit - - slotTemplateSelectionChanged(QListViewItem*) + + slotTemplateSelectionChanged(TQListViewItem*) dtdCombo_activated(const QString&) slotGroupChanged(const QString&) slotAddTemplate() slotRemoveTemplate() - templatesList_currentChanged(QListViewItem*) + templatesList_currentChanged(TQListViewItem*) slotEditTemplate() slotAddDTEP() slotRemoveDTEP() slotNewGroup() - - + + klistview.h klistbox.h diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 5aa9254f..733b66eb 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2003 by Andras Mantia <amantia@kde.org> - + CodeTemplateDlgS @@ -21,7 +21,7 @@ 72 - + 400 70 @@ -34,7 +34,7 @@ unnamed - + textLabel1 @@ -45,7 +45,7 @@ templateEdit - + textLabel2 @@ -56,12 +56,12 @@ descriptionEdit - + templateEdit - + descriptionEdit @@ -72,10 +72,10 @@ templateEdit descriptionEdit - + accept() reject() pushButton4_clicked() - - + + diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index fee135f8..5f96a2eb 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filesmask.cpp - description + filestqmask.cpp - description ------------------- begin : Fri May 19 2000 copyright : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky @@ -23,15 +23,15 @@ //kde includes #include -FileMasks::FileMasks(TQWidget *parent, const char *name) - :FileMasksS(parent,name) +FileMasks::FileMasks(TQWidget *tqparent, const char *name) + :FileMasksS(tqparent,name) { connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); } FileMasks::~FileMasks(){ } -/** set masks to default */ +/** set tqmasks to default */ void FileMasks::setToDefault() { KMimeType::List list = KMimeType::allMimeTypes(); @@ -43,12 +43,12 @@ void FileMasks::setToDefault() for ( it = list.begin(); it != list.end(); ++it ) { name = (*it)->name(); - if (name.contains("text")) + if (name.tqcontains("text")) { - if (!markup.contains(name) && !script.contains(name)) + if (!markup.tqcontains(name) && !script.tqcontains(name)) text += name+"; "; } - if (name.contains("image")) + if (name.tqcontains("image")) { image += name +"; "; } diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h index 965eb190..cc596259 100644 --- a/quanta/dialogs/settings/filemasks.h +++ b/quanta/dialogs/settings/filemasks.h @@ -1,5 +1,5 @@ /*************************************************************************** - filesmask.h - description + filestqmask.h - description ------------------- begin : Fri May 19 2000 copyright : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky @@ -24,8 +24,9 @@ class FileMasks : public FileMasksS { Q_OBJECT + TQ_OBJECT public: - FileMasks(TQWidget *parent=0, const char *name=0); + FileMasks(TQWidget *tqparent=0, const char *name=0); ~FileMasks(); public slots: diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index f8cdb4f6..fb7d322a 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ - + FileMasksS @@ -29,7 +29,7 @@ 0 - + 0 0 @@ -39,12 +39,12 @@ unnamed - + encodingCombo - + defaultDTDCombo @@ -52,7 +52,7 @@ New files will have the extension and highlighting according to this setting - + GroupBox1 @@ -69,23 +69,23 @@ unnamed - + lineMarkup - + AlignLeft - + lineImage - + AlignLeft - + buttonDefault @@ -93,7 +93,7 @@ &Reset to Default - + TextLabel4_2 @@ -104,7 +104,7 @@ lineText - + TextLabel1_3 @@ -115,7 +115,7 @@ lineMarkup - + TextLabel3_2 @@ -126,15 +126,15 @@ lineImage - + lineText - + AlignLeft - + TextLabel2_2 @@ -146,7 +146,7 @@ 0 - + 0 0 @@ -172,38 +172,38 @@ Expanding - + 153 20 - + lineScript - + AlignLeft - + TextLabel1_2 Default character &encoding: - + AlignVCenter|AlignLeft encodingCombo - + TextLabel1_2_3 @@ -224,14 +224,14 @@ Expanding - + 20 50 - + buttonGroup7 @@ -242,7 +242,7 @@ unnamed - + reloadFiles @@ -250,7 +250,7 @@ L&oad last-opened files - + showSplash @@ -258,7 +258,7 @@ S&how splashscreen - + reloadProject @@ -268,15 +268,15 @@ - + - layout2 + tqlayout2 unnamed - + tlAutoSave @@ -284,7 +284,7 @@ Create backups every - + sbAutoSave @@ -298,7 +298,7 @@ 15 - + textLabel1 @@ -308,7 +308,7 @@ - + showDTDSelectDialog @@ -332,5 +332,5 @@ reloadProject reloadFiles - + diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp index 24e3c6a6..c38e2875 100644 --- a/quanta/dialogs/settings/parseroptions.cpp +++ b/quanta/dialogs/settings/parseroptions.cpp @@ -22,11 +22,11 @@ #include /* - * Constructs a ParserOptions which is a child of 'parent', with the + * Constructs a ParserOptions which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent, const char* name ) - : ParserOptionsUI( parent, name ) +ParserOptions::ParserOptions( KConfig *a_config, TQWidget* tqparent, const char* name ) + : ParserOptionsUI( tqparent, name ) { config = a_config; config->setGroup("Parser options"); @@ -70,7 +70,7 @@ ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent, const char* */ ParserOptions::~ParserOptions() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h index a4c5f6f3..55710161 100644 --- a/quanta/dialogs/settings/parseroptions.h +++ b/quanta/dialogs/settings/parseroptions.h @@ -23,9 +23,10 @@ class KConfig; class ParserOptions : public ParserOptionsUI { Q_OBJECT + TQ_OBJECT public: - ParserOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); + ParserOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0); ~ParserOptions(); void updateConfig(); diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui index 34a54cd6..2a5fed0b 100644 --- a/quanta/dialogs/settings/parseroptionsui.ui +++ b/quanta/dialogs/settings/parseroptionsui.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2002 Andras Mantia <amantia@kde.org> - + ParserOptionsUI @@ -29,7 +29,7 @@ 0 - + 0 0 @@ -39,7 +39,7 @@ unnamed - + buttonGroup1 @@ -50,7 +50,7 @@ unnamed - + refreshFrequency @@ -74,14 +74,14 @@ Expanding - + 122 20 - + instantUpdate @@ -102,14 +102,14 @@ Expanding - + 122 20 - + showClosingTags @@ -117,7 +117,7 @@ Show closing tags - + showEmptyNodes @@ -125,7 +125,7 @@ Show empt&y nodes and groups - + spinExpand @@ -136,7 +136,7 @@ Set to 0 in order to expand the whole tree - + TextLabel1_5 @@ -144,7 +144,7 @@ Refresh frequency (in seconds): - + TextLabel2_2 @@ -154,7 +154,7 @@ - + GroupBox1 @@ -168,7 +168,7 @@ unnamed - + Select Tag Area @@ -183,7 +183,7 @@ comboDoubleClick - + Find Tag @@ -198,7 +198,7 @@ comboLBM - + TextLabel1 @@ -206,7 +206,7 @@ Left button: - + Popup Menu @@ -216,7 +216,7 @@ comboRBM - + TextLabel1_4 @@ -224,7 +224,7 @@ Double click: - + TextLabel1_2 @@ -232,7 +232,7 @@ Middle button: - + TextLabel1_3 @@ -240,7 +240,7 @@ Right button: - + Find Tag & Open Tree @@ -282,7 +282,7 @@ Expanding - + 20 40 @@ -310,5 +310,5 @@ refreshFrequency spinExpand - + diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp index 2df03ea9..3c0e3c1b 100644 --- a/quanta/dialogs/settings/previewoptions.cpp +++ b/quanta/dialogs/settings/previewoptions.cpp @@ -23,17 +23,17 @@ #include #include -PreviewOptions::PreviewOptions(TQWidget *parent, const char *name) - : PreviewOptionsS(parent,name) +PreviewOptions::PreviewOptions(TQWidget *tqparent, const char *name) + : PreviewOptionsS(tqparent,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 3cc5b820..ebddcc32 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -24,12 +24,13 @@ class KConfig; class PreviewOptions : public PreviewOptionsS { Q_OBJECT + TQ_OBJECT public: - PreviewOptions(TQWidget *parent=0, const char *name=0); + PreviewOptions(TQWidget *tqparent=0, const char *name=0); ~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 a27a164b..e3743258 100644 --- a/quanta/dialogs/settings/previewoptionss.ui +++ b/quanta/dialogs/settings/previewoptionss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ - + PreviewOptionsS @@ -21,7 +21,7 @@ 512 - + 350 220 @@ -31,15 +31,15 @@ unnamed - + resetLayout - Reset window layout to the default on the next startup + Reset window tqlayout to the default on the next startup - + showHidden @@ -47,7 +47,7 @@ Show hidden files in files tree - + saveLocalTrees @@ -55,7 +55,7 @@ Save tree status for local trees - + buttonGroup3 @@ -66,7 +66,7 @@ unnamed - + radioShowCloseButtons @@ -77,7 +77,7 @@ true - + radioNoCloseButtons @@ -85,7 +85,7 @@ &Do not show - + radioDelayedCloseButtons @@ -95,7 +95,7 @@ - + buttonGroup3_2 @@ -106,7 +106,7 @@ unnamed - + radioNewDocTab @@ -117,7 +117,7 @@ true - + radioSeparateDocView @@ -127,7 +127,7 @@ - + buttonGroup4 @@ -138,7 +138,7 @@ unnamed - + radioIconText @@ -149,7 +149,7 @@ true - + radioText @@ -157,7 +157,7 @@ Text - + radioIcon @@ -167,7 +167,7 @@ - + ButtonGroup1 @@ -184,7 +184,7 @@ 6 - + radioToolview @@ -192,7 +192,7 @@ Separate toolview - + radioEditor @@ -215,14 +215,14 @@ Expanding - + 20 30 - + buttonGroup1 @@ -233,7 +233,7 @@ unnamed - + warnBinaryOpening @@ -241,7 +241,7 @@ Warn about opening binar&y/unknown files - + warnEventActions @@ -249,7 +249,7 @@ Warn when executing &actions associated with events - + warnAll @@ -276,5 +276,5 @@ radioNoCloseButtons radioDelayedCloseButtons - + diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui index 13ed198d..242e7e7c 100644 --- a/quanta/dialogs/settings/styleoptionss.ui +++ b/quanta/dialogs/settings/styleoptionss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ - + StyleOptionsS @@ -29,7 +29,7 @@ 0 - + 410 250 @@ -39,7 +39,7 @@ unnamed - + TextLabel3 @@ -47,7 +47,7 @@ Attribute quotation: - + Double Quotes @@ -62,7 +62,7 @@ attributeQuotation - + TextLabel1 @@ -70,7 +70,7 @@ Tag case: - + TextLabel2 @@ -78,7 +78,7 @@ Attribute case: - + Default Case @@ -98,7 +98,7 @@ attributeCase - + optionalTagAutoClose @@ -106,7 +106,7 @@ Auto-close o&ptional tags - + Default Case @@ -126,7 +126,7 @@ tagCase - + tagAutoClose @@ -144,14 +144,14 @@ Expanding - + 20 30 - + tagUpdateClosing @@ -159,7 +159,7 @@ &Update opening/closing tag automatically - + useAutoCompletion @@ -175,7 +175,7 @@ Use &auto-completion - + replaceAccented @@ -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. @@ -197,5 +197,5 @@ We suggest to leave this option off and use an unicode or locale encoding for yo tagAutoClose useAutoCompletion - + -- cgit v1.2.1