diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /libkdepim/kscoringeditor.cpp | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdepim/kscoringeditor.cpp')
-rw-r--r-- | libkdepim/kscoringeditor.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libkdepim/kscoringeditor.cpp b/libkdepim/kscoringeditor.cpp index de76d3e81..7cec1a7db 100644 --- a/libkdepim/kscoringeditor.cpp +++ b/libkdepim/kscoringeditor.cpp @@ -15,7 +15,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kscoring.h" #include "kscoringeditor.h" @@ -160,9 +160,9 @@ ConditionEditWidget::ConditionEditWidget(KScoringManager *m, TQWidget *p, const ConditionEditWidget::~ConditionEditWidget() {} -TQWidget* ConditionEditWidget::createWidget(TQWidget *parent) +TQWidget* ConditionEditWidget::createWidget(TQWidget *tqparent) { - return new SingleConditionWidget(manager,parent); + return new SingleConditionWidget(manager,tqparent); } void ConditionEditWidget::clearWidget(TQWidget *w) @@ -226,7 +226,7 @@ SingleActionWidget::SingleActionWidget(KScoringManager *m,TQWidget *p, const cha // init widget stack and the types combo box int index = 1; - types->insertItem(TQString::null); + types->insertItem(TQString()); TQStringList l = ActionBase::userNames(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { TQString name = *it; @@ -334,9 +334,9 @@ ActionEditWidget::ActionEditWidget(KScoringManager *m,TQWidget *p, const char *n ActionEditWidget::~ActionEditWidget() {} -TQWidget* ActionEditWidget::createWidget( TQWidget *parent ) +TQWidget* ActionEditWidget::createWidget( TQWidget *tqparent ) { - return new SingleActionWidget(manager,parent); + return new SingleActionWidget(manager,tqparent); } void ActionEditWidget::slotEditRule(KScoringRule *rule) @@ -390,7 +390,7 @@ void ActionEditWidget::clearWidget(TQWidget *w) // //============================================================================ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) - : TQWidget(p,n), dirty(false), manager(m), oldRuleName(TQString::null) + : TQWidget(p,n), dirty(false), manager(m), oldRuleName(TQString()) { kdDebug(5100) << "RuleEditWidget::RuleEditWidget()" << endl; if ( !n ) setName( "RuleEditWidget" ); @@ -533,12 +533,12 @@ void RuleEditWidget::clearContents() expireEdit->setEnabled(false); condEditor->slotEditRule(0); actionEditor->slotEditRule(0); - oldRuleName = TQString::null; + oldRuleName = TQString(); } void RuleEditWidget::updateRule(KScoringRule *rule) { - oldRuleName = TQString::null; + oldRuleName = TQString(); TQString groups = groupsEdit->text(); if (groups.isEmpty()) rule->setGroups(TQStringList(".*")); @@ -746,7 +746,7 @@ void RuleListWidget::slotEditRule() emit ruleEdited(ruleList->currentText()); } else if (ruleList->count() == 0) - emit ruleEdited(TQString::null); + emit ruleEdited(TQString()); } void RuleListWidget::slotEditRule(TQListBoxItem* item) @@ -858,8 +858,8 @@ void RuleListWidget::slotRuleDown() KScoringEditor* KScoringEditor::scoreEditor = 0; KScoringEditor::KScoringEditor(KScoringManager* m, - TQWidget *parent, const char *name) - : KDialogBase(parent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m) + TQWidget *tqparent, const char *name) + : KDialogBase(tqparent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m) { manager->pushRuleList(); if (!scoreEditor) scoreEditor = this; @@ -896,10 +896,10 @@ KScoringEditor::~KScoringEditor() } KScoringEditor* KScoringEditor::createEditor(KScoringManager* m, - TQWidget *parent, const char *name) + TQWidget *tqparent, const char *name) { if (scoreEditor) return scoreEditor; - else return new KScoringEditor(m,parent,name); + else return new KScoringEditor(m,tqparent,name); } void KScoringEditor::setRule(KScoringRule* r) |