summaryrefslogtreecommitdiffstats
path: root/kalarm/lib
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/lib')
-rw-r--r--kalarm/lib/checkbox.cpp6
-rw-r--r--kalarm/lib/checkbox.h2
-rw-r--r--kalarm/lib/colourcombo.cpp4
-rw-r--r--kalarm/lib/colourlist.h2
-rw-r--r--kalarm/lib/combobox.cpp2
-rw-r--r--kalarm/lib/dateedit.cpp4
-rw-r--r--kalarm/lib/datetime.h2
-rw-r--r--kalarm/lib/label.cpp4
-rw-r--r--kalarm/lib/lineedit.cpp4
-rw-r--r--kalarm/lib/pushbutton.cpp6
-rw-r--r--kalarm/lib/pushbutton.h2
-rw-r--r--kalarm/lib/radiobutton.cpp6
-rw-r--r--kalarm/lib/radiobutton.h2
-rw-r--r--kalarm/lib/shellprocess.cpp2
-rw-r--r--kalarm/lib/slider.cpp2
-rw-r--r--kalarm/lib/spinbox.cpp10
-rw-r--r--kalarm/lib/spinbox2.cpp16
-rw-r--r--kalarm/lib/timespinbox.cpp2
18 files changed, 39 insertions, 39 deletions
diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp
index cff6cdb17..1d9cabffb 100644
--- a/kalarm/lib/checkbox.cpp
+++ b/kalarm/lib/checkbox.cpp
@@ -44,7 +44,7 @@ void CheckBox::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? Qt::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -86,7 +86,7 @@ void CheckBox::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQCheckBox::mousePressEvent(e);
@@ -97,7 +97,7 @@ void CheckBox::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQCheckBox::mouseReleaseEvent(e);
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 6b6985cd6..e535d4eab 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -80,7 +80,7 @@ class CheckBox : public TQCheckBox
protected slots:
void slotClicked();
private:
- TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQCheckBox
+ Qt::FocusPolicy mFocusPolicy; // default focus policy for the TQCheckBox
TQWidget* mFocusWidget; // widget to receive focus when button is clicked on
bool mFocusWidgetEnable; // enable focus widget before setting focus
bool mReadOnly; // value cannot be changed
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 769e6518b..5cea7fb83 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -41,7 +41,7 @@ ColourCombo::ColourCombo(TQWidget* tqparent, const char* name, const TQColor& de
addColours();
connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
connect(this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlighted(int)));
- Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged()));
+ Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged()));
}
void ColourCombo::setColour(const TQColor& colour)
@@ -208,7 +208,7 @@ void ColourCombo::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQComboBox::mousePressEvent(e);
diff --git a/kalarm/lib/colourlist.h b/kalarm/lib/colourlist.h
index 7bee8d149..91fabaf92 100644
--- a/kalarm/lib/colourlist.h
+++ b/kalarm/lib/colourlist.h
@@ -95,7 +95,7 @@ class ColourList
/** Returns the index to the first occurrence of colour @p c in the list.
* Returns -1 if colour @p c is not in the list.
*/
- int findIndex(const TQColor& c) const { return mList.findIndex(c.rgb()); }
+ int findIndex(const TQColor& c) const { return mList.tqfindIndex(c.rgb()); }
/** Returns the first colour in the list. If the list is empty, the result is undefined. */
TQColor first() const { return TQColor(mList.first()); }
/** Returns the last colour in the list. If the list is empty, the result is undefined. */
diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp
index 0c526cae3..2acb5a442 100644
--- a/kalarm/lib/combobox.cpp
+++ b/kalarm/lib/combobox.cpp
@@ -47,7 +47,7 @@ void ComboBox::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQComboBox::mousePressEvent(e);
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 38a6a5cba..0a916d9f6 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -81,7 +81,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons
errString = i18n("today");
else
errString = KGlobal::locale()->formatDate(limit, true);
- errString = defaultError.arg(errString);
+ errString = defaultError.tqarg(errString);
}
KMessageBox::sorry(this, errString);
}
@@ -91,7 +91,7 @@ void DateEdit::mousePressEvent(TQMouseEvent *e)
if (isReadOnly())
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
KDateEdit::mousePressEvent(e);
diff --git a/kalarm/lib/datetime.h b/kalarm/lib/datetime.h
index 976bada90..bcfa434b1 100644
--- a/kalarm/lib/datetime.h
+++ b/kalarm/lib/datetime.h
@@ -169,7 +169,7 @@ class DateTime
* If it is a date-time, both time and date are included in the output.
* If it is date-only, only the date is included in the output.
*/
- TQString toString(TQt::DateFormat f = TQt::TextDate) const
+ TQString toString(Qt::DateFormat f = Qt::TextDate) const
{
if (mDateOnly)
return mDateTime.date().toString(f);
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index d2b18ba10..d532b67e3 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -55,7 +55,7 @@ void Label::setBuddy(TQWidget* bud)
if (w)
{
while (w->focusProxy())
- w = w->focusProxy();
+ w = TQT_TQWIDGET(w->focusProxy());
if (!w->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING))
w = 0;
}
@@ -106,7 +106,7 @@ void Label::activated()
LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name)
: TQWidget(tqparent, name)
{
- setFocusPolicy(ClickFocus);
+ setFocusPolicy(Qt::ClickFocus);
setFixedSize(TQSize(1,1));
}
diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp
index d85a99458..f19ed8066 100644
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@@ -78,11 +78,11 @@ void LineEdit::init()
void LineEdit::focusInEvent(TQFocusEvent* e)
{
if (mNoSelect)
- TQFocusEvent::setReason(TQFocusEvent::Other);
+ e->setReason(TQFocusEvent::Other);
KLineEdit::focusInEvent(e);
if (mNoSelect)
{
- TQFocusEvent::resetReason();
+ e->resetReason();
mNoSelect = false;
}
}
diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp
index e1e04099a..c251fa3c5 100644
--- a/kalarm/lib/pushbutton.cpp
+++ b/kalarm/lib/pushbutton.cpp
@@ -44,7 +44,7 @@ void PushButton::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? Qt::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -55,7 +55,7 @@ void PushButton::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQPushButton::mousePressEvent(e);
@@ -66,7 +66,7 @@ void PushButton::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQPushButton::mouseReleaseEvent(e);
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index 615ea10cb..d0f4b0652 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -71,7 +71,7 @@ class PushButton : public TQPushButton
virtual void keyPressEvent(TQKeyEvent*);
virtual void keyReleaseEvent(TQKeyEvent*);
private:
- TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQPushButton
+ Qt::FocusPolicy mFocusPolicy; // default focus policy for the TQPushButton
bool mReadOnly; // value cannot be changed
};
diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp
index d08097887..f34a574e3 100644
--- a/kalarm/lib/radiobutton.cpp
+++ b/kalarm/lib/radiobutton.cpp
@@ -44,7 +44,7 @@ void RadioButton::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? Qt::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -86,7 +86,7 @@ void RadioButton::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQRadioButton::mousePressEvent(e);
@@ -97,7 +97,7 @@ void RadioButton::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQRadioButton::mouseReleaseEvent(e);
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index 9395be608..baa7cba39 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -80,7 +80,7 @@ class RadioButton : public TQRadioButton
protected slots:
void slotClicked();
private:
- TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQRadioButton
+ Qt::FocusPolicy mFocusPolicy; // default focus policy for the TQRadioButton
TQWidget* mFocusWidget; // widget to receive focus when button is clicked on
bool mFocusWidgetEnable; // enable focus widget before setting focus
bool mReadOnly; // value cannot be changed
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index 09daf91db..c2f2e11bd 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -185,7 +185,7 @@ const TQCString& ShellProcess::shellPath()
}
// Get the shell filename with the path stripped off
- int i = mShellPath.findRev('/');
+ int i = mShellPath.tqfindRev('/');
if (i >= 0)
mShellName = mShellPath.mid(i + 1);
else
diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp
index 0b30f744a..f901f6db1 100644
--- a/kalarm/lib/slider.cpp
+++ b/kalarm/lib/slider.cpp
@@ -54,7 +54,7 @@ void Slider::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQSlider::mousePressEvent(e);
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index 19608eabe..fc8e6b7c3 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -201,7 +201,7 @@ void SpinBox::updateDisplay()
*/
bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
{
- if (obj == editor())
+ if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(editor()))
{
int step = 0;
bool shift = false;
@@ -263,7 +263,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseButtonDblClick:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->button() == TQt::LeftButton)
+ if (me->button() == Qt::LeftButton)
{
// It's a left button press. Set normal or shift stepping as appropriate.
if (mReadOnly)
@@ -281,7 +281,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseButtonRelease:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->button() == TQt::LeftButton && mShiftMouse)
+ if (me->button() == Qt::LeftButton && mShiftMouse)
{
setShiftStepping(false, mCurrentButton); // cancel shift stepping
return false; // forward event to the destination widget
@@ -291,7 +291,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseMove:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->state() & TQt::LeftButton)
+ if (me->state() & Qt::LeftButton)
{
// The left button is down. Track which spin button it's in.
if (mReadOnly)
@@ -325,7 +325,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
TQKeyEvent* ke = (TQKeyEvent*)e;
int key = ke->key();
int state = ke->state();
- if ((state & TQt::LeftButton)
+ if ((state & Qt::LeftButton)
&& (key == TQt::Key_Shift || key == TQt::Key_Alt))
{
// The left mouse button is down, and the Shift or Alt key has changed
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index 8627838b6..3d7cde021 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -85,9 +85,9 @@ void SpinBox2::init()
mSpinbox->setSelectOnStep(false); // default
mUpdown2->setSelectOnStep(false); // always false
setFocusProxy(mSpinbox);
- mUpdown2->setFocusPolicy(TQWidget::NoFocus);
+ mUpdown2->setFocusPolicy(Qt::NoFocus);
mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this);
- if (!mirrorStyle(style()))
+ if (!mirrorStyle(tqstyle()))
mSpinMirror->hide(); // hide mirrored spin buttons when they are inappropriate
connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChange()));
connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int)));
@@ -243,7 +243,7 @@ TQSize SpinBox2::tqminimumSizeHint() const
void SpinBox2::styleChange(TQStyle&)
{
- if (mirrorStyle(style()))
+ if (mirrorStyle(tqstyle()))
mSpinMirror->show(); // show rounded corners with Plastik etc.
else
mSpinMirror->hide(); // keep normal shading with other styles
@@ -282,16 +282,16 @@ void SpinBox2::arrange()
*/
void SpinBox2::getMetrics() const
{
- TQRect rect = mUpdown2->style().querySubControlMetrics(TQStyle::CC_SpinWidget, mUpdown2, TQStyle::SC_SpinWidgetButtonField);
- if (style().inherits("PlastikStyle"))
+ TQRect rect = mUpdown2->tqstyle().querySubControlMetrics(TQStyle::CC_SpinWidget, mUpdown2, TQStyle::SC_SpinWidgetButtonField);
+ if (tqstyle().inherits("PlastikStyle"))
rect.setLeft(rect.left() - 1); // Plastik excludes left border from spin widget rectangle
xUpdown2 = mReverseLayout ? 0 : rect.left();
wUpdown2 = mUpdown2->width() - rect.left();
- xSpinbox = mSpinbox->style().querySubControlMetrics(TQStyle::CC_SpinWidget, mSpinbox, TQStyle::SC_SpinWidgetEditField).left();
+ xSpinbox = mSpinbox->tqstyle().querySubControlMetrics(TQStyle::CC_SpinWidget, mSpinbox, TQStyle::SC_SpinWidgetEditField).left();
wGap = 0;
// Make style-specific adjustments for a better appearance
- if (style().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING))
+ if (tqstyle().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING))
{
xSpinbox = 0; // show the edit control left border
wGap = 2; // leave a space to the right of the left-hand pair of spin buttons
@@ -422,7 +422,7 @@ void SpinMirror::redraw()
void SpinMirror::redraw(const TQPixmap& px)
{
TQCanvas* c = canvas();
- c->setBackgroundPixmap(px);
+ c->tqsetBackgroundPixmap(px);
c->setAllChanged();
c->update();
}
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index f8700a505..1a2a65008 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -31,7 +31,7 @@ class TimeSpinBox::TimeValidator : public TQValidator
{
public:
TimeValidator(int minMin, int maxMin, TQWidget* tqparent, const char* name = 0)
- : TQValidator(tqparent, name),
+ : TQValidator(TQT_TQOBJECT(tqparent), name),
minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { }
virtual State validate(TQString&, int&) const;
int minMinute, maxMinute;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 12:23:04 +0000