diff options
Diffstat (limited to 'libtdepim/kscoringeditor.cpp')
| -rw-r--r-- | libtdepim/kscoringeditor.cpp | 78 | 
1 files changed, 38 insertions, 40 deletions
| diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 7942e4ef..1a536e82 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -15,8 +15,6 @@      Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US  */ -#undef TQT_NO_COMPAT -  #include "kscoring.h"  #include "kscoringeditor.h" @@ -78,7 +76,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con    matches->insertStringList(KScoringExpression::conditionNames());    TQToolTip::add(matches,i18n("Select the type of match"));    firstRow->addWidget(matches,1); -  connect( matches, TQT_SIGNAL( activated( int ) ), TQT_SLOT( toggleRegExpButton( int ) ) ); +  connect( matches, TQ_SIGNAL( activated( int ) ), TQ_SLOT( toggleRegExpButton( int ) ) );    TQHBoxLayout *secondRow = new TQHBoxLayout( topL );    secondRow->setSpacing( 1 );    expr = new KLineEdit( this ); @@ -88,7 +86,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con    secondRow->addWidget( expr );    regExpButton = new TQPushButton( i18n("Edit..."), this );    secondRow->addWidget( regExpButton ); -  connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) ); +  connect( regExpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( showRegExpDialog() ) );    // occupy at much width as possible    setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); @@ -253,7 +251,7 @@ SingleActionWidget::SingleActionWidget(KScoringManager *m,TQWidget *p, const cha      }    } -  connect(types,TQT_SIGNAL(activated(int)),stack,TQT_SLOT(raiseWidget(int))); +  connect(types,TQ_SIGNAL(activated(int)),stack,TQ_SLOT(raiseWidget(int)));    // raise the dummy label    types->setCurrentItem(0); @@ -415,7 +413,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)    groupL->addWidget( groupsLabel, 2, 0 );    TQPushButton *groupsBtn = new TQPushButton(i18n("A&dd Group"), groupB); -  connect(groupsBtn,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddGroup())); +  connect(groupsBtn,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddGroup()));    groupL->addWidget( groupsBtn, 3, 0 );    groupsBox = new KComboBox( false, groupB, "groupsBox" ); @@ -430,15 +428,15 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)    expireEdit = new KIntSpinBox(1,99999,1,30,10, groupB, "expireWidget");    //Init suffix    slotExpireEditChanged(30); -  connect(expireEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotExpireEditChanged(int))); +  connect(expireEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotExpireEditChanged(int)));    groupL->addWidget( expireEdit, 5, 1 );    expireLabel = new TQLabel(expireEdit, i18n("&Rule is valid for:"), groupB, "expireLabel");    groupL->addWidget( expireLabel, 5, 0 );    expireLabel->setEnabled(false);    expireEdit->setEnabled(false); -  connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireLabel, TQT_SLOT(setEnabled(bool))); -  connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireEdit, TQT_SLOT(setEnabled(bool))); +  connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireLabel, TQ_SLOT(setEnabled(bool))); +  connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireEdit, TQ_SLOT(setEnabled(bool)));    //------------- Conditions ---------------------    TQGroupBox *groupConds = new TQGroupBox(i18n("Conditions"), this); @@ -459,7 +457,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)    condEditor = new ConditionEditWidget(manager,groupConds);    condL->addMultiCellWidget(condEditor, 2,2, 0,1); -  connect(condEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink())); +  connect(condEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink()));    //------------- Actions ---------------------    TQGroupBox *groupActions = new TQGroupBox(i18n("Actions"), this); @@ -468,7 +466,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)    actionL->addSpacing(fontMetrics().lineSpacing()-4);    actionEditor = new ActionEditWidget(manager,groupActions);    actionL->addWidget(actionEditor); -  connect(actionEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink())); +  connect(actionEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink()));    topLayout->addStretch(1); @@ -602,13 +600,13 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,    TQVBoxLayout *topL = new TQVBoxLayout(this,standalone? 0:5,KDialog::spacingHint());    ruleList = new TDEListBox(this);    if (standalone) { -    connect(ruleList,TQT_SIGNAL(doubleClicked(TQListBoxItem*)), -            this,TQT_SLOT(slotEditRule(TQListBoxItem*))); -    connect(ruleList,TQT_SIGNAL(returnPressed(TQListBoxItem*)), -            this,TQT_SLOT(slotEditRule(TQListBoxItem*))); +    connect(ruleList,TQ_SIGNAL(doubleClicked(TQListBoxItem*)), +            this,TQ_SLOT(slotEditRule(TQListBoxItem*))); +    connect(ruleList,TQ_SIGNAL(returnPressed(TQListBoxItem*)), +            this,TQ_SLOT(slotEditRule(TQListBoxItem*)));    } -  connect(ruleList, TQT_SIGNAL(currentChanged(TQListBoxItem*)), -          this, TQT_SLOT(slotRuleSelected(TQListBoxItem*))); +  connect(ruleList, TQ_SIGNAL(currentChanged(TQListBoxItem*)), +          this, TQ_SLOT(slotRuleSelected(TQListBoxItem*)));    topL->addWidget(ruleList);    TQHBoxLayout *btnL = new TQHBoxLayout( topL, KDialog::spacingHint() ); @@ -616,12 +614,12 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,    mRuleUp->setPixmap( BarIcon( "go-up", TDEIcon::SizeSmall ) );    TQToolTip::add( mRuleUp, i18n("Move rule up") );    btnL->addWidget( mRuleUp ); -  connect( mRuleUp, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleUp() ) ); +  connect( mRuleUp, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleUp() ) );    mRuleDown = new TQPushButton( this );    mRuleDown->setPixmap( BarIcon( "go-down", TDEIcon::SizeSmall ) );    TQToolTip::add( mRuleDown, i18n("Move rule down") );    btnL->addWidget( mRuleDown ); -  connect( mRuleDown, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleDown() ) ); +  connect( mRuleDown, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleDown() ) );    btnL = new TQHBoxLayout( topL, KDialog::spacingHint() );    editRule=0L; @@ -629,25 +627,25 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,    newRule->setPixmap( BarIcon( "document-new", TDEIcon::SizeSmall ) );    TQToolTip::add(newRule,i18n("New rule")),    btnL->addWidget(newRule); -  connect(newRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewRule())); +  connect(newRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewRule()));    // if we're standalone, we need an additional edit button    if (standalone) {      editRule = new TQPushButton(this);      editRule->setIconSet( BarIconSet("edit", TDEIcon::SizeSmall) );      TQToolTip::add(editRule,i18n("Edit rule"));      btnL->addWidget(editRule); -    connect(editRule,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditRule())); +    connect(editRule,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEditRule()));    }    delRule = new TQPushButton(this);    delRule->setIconSet( BarIconSet( "edit-delete", TDEIcon::SizeSmall ) );    TQToolTip::add(delRule,i18n("Remove rule"));    btnL->addWidget(delRule); -  connect(delRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelRule())); +  connect(delRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelRule()));    copyRule = new TQPushButton(this);    copyRule->setIconSet(BarIconSet("edit-copy", TDEIcon::SizeSmall));    TQToolTip::add(copyRule,i18n("Copy rule"));    btnL->addWidget(copyRule); -  connect(copyRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyRule())); +  connect(copyRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyRule()));    // the group filter    TQBoxLayout *filterL = new TQVBoxLayout(topL,KDialog::spacingHint()); @@ -656,17 +654,17 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,    filterBox->insertItem(i18n("<all groups>"));    filterBox->insertStringList(l);    filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); -  connect(filterBox,TQT_SIGNAL(activated(const TQString&)), -          this,TQT_SLOT(slotGroupFilter(const TQString&))); +  connect(filterBox,TQ_SIGNAL(activated(const TQString&)), +          this,TQ_SLOT(slotGroupFilter(const TQString&)));    slotGroupFilter(i18n("<all groups>"));    TQLabel *lab = new TQLabel(filterBox,i18n("Sho&w only rules for group:"),this);    filterL->addWidget(lab);    filterL->addWidget(filterBox); -  connect(manager,TQT_SIGNAL(changedRules()), -          this,TQT_SLOT(updateRuleList())); -  connect(manager,TQT_SIGNAL(changedRuleName(const TQString&,const TQString&)), -          this,TQT_SLOT(slotRuleNameChanged(const TQString&,const TQString&))); +  connect(manager,TQ_SIGNAL(changedRules()), +          this,TQ_SLOT(updateRuleList())); +  connect(manager,TQ_SIGNAL(changedRuleName(const TQString&,const TQString&)), +          this,TQ_SLOT(slotRuleNameChanged(const TQString&,const TQString&)));    updateRuleList();    updateButton(); @@ -874,12 +872,12 @@ KScoringEditor::KScoringEditor(KScoringManager* m,    hbl->addWidget(ruleLister);    ruleEditor = new RuleEditWidget(manager,w);    hbl->addWidget(ruleEditor); -  connect(ruleLister,TQT_SIGNAL(ruleSelected(const TQString&)), -          ruleEditor, TQT_SLOT(slotEditRule(const TQString&))); -  connect(ruleLister, TQT_SIGNAL(leavingRule()), -          ruleEditor, TQT_SLOT(updateRule())); -  connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); -  connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished())); +  connect(ruleLister,TQ_SIGNAL(ruleSelected(const TQString&)), +          ruleEditor, TQ_SLOT(slotEditRule(const TQString&))); +  connect(ruleLister, TQ_SIGNAL(leavingRule()), +          ruleEditor, TQ_SLOT(updateRule())); +  connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink())); +  connect(this,TQ_SIGNAL(finished()),TQ_SLOT(slotFinished()));    ruleLister->slotRuleSelected(0);    resize(550, sizeHint().height());  } @@ -911,7 +909,7 @@ void KScoringEditor::setRule(KScoringRule* r)  void KScoringEditor::slotShrink()  { -  TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink())); +  TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink()));  }  void KScoringEditor::slotDoShrink() @@ -966,7 +964,7 @@ KScoringEditorWidgetDialog::KScoringEditorWidgetDialog(KScoringManager *m, const    TQFrame *f = makeMainWidget();    TQBoxLayout *topL = new TQVBoxLayout(f);    ruleEditor = new RuleEditWidget(manager,f); -  connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); +  connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink()));    topL->addWidget(ruleEditor);    ruleEditor->slotEditRule(ruleName);    resize(0,0); @@ -989,7 +987,7 @@ void KScoringEditorWidgetDialog::slotOk()  void KScoringEditorWidgetDialog::slotShrink()  { -  TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink())); +  TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink()));  }  void KScoringEditorWidgetDialog::slotDoShrink() @@ -1010,8 +1008,8 @@ KScoringEditorWidget::KScoringEditorWidget(KScoringManager *m,TQWidget *p, const    TQBoxLayout *topL = new TQVBoxLayout(this);    ruleLister = new RuleListWidget(manager,true,this);    topL->addWidget(ruleLister); -  connect(ruleLister,TQT_SIGNAL(ruleEdited(const TQString&)), -          this,TQT_SLOT(slotRuleEdited(const TQString &))); +  connect(ruleLister,TQ_SIGNAL(ruleEdited(const TQString&)), +          this,TQ_SLOT(slotRuleEdited(const TQString &)));  }  KScoringEditorWidget::~KScoringEditorWidget() | 
