summaryrefslogtreecommitdiffstats
path: root/kalarm/lib
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/lib')
-rw-r--r--kalarm/lib/buttongroup.cpp14
-rw-r--r--kalarm/lib/buttongroup.h4
-rw-r--r--kalarm/lib/checkbox.cpp10
-rw-r--r--kalarm/lib/checkbox.h2
-rw-r--r--kalarm/lib/colourcombo.cpp8
-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.cpp8
-rw-r--r--kalarm/lib/pushbutton.cpp6
-rw-r--r--kalarm/lib/pushbutton.h2
-rw-r--r--kalarm/lib/radiobutton.cpp10
-rw-r--r--kalarm/lib/radiobutton.h2
-rw-r--r--kalarm/lib/shellprocess.cpp6
-rw-r--r--kalarm/lib/shellprocess.h2
-rw-r--r--kalarm/lib/slider.cpp6
-rw-r--r--kalarm/lib/slider.h4
-rw-r--r--kalarm/lib/spinbox.cpp12
-rw-r--r--kalarm/lib/spinbox2.cpp18
-rw-r--r--kalarm/lib/synchtimer.cpp4
-rw-r--r--kalarm/lib/timeedit.cpp4
-rw-r--r--kalarm/lib/timeperiod.cpp6
-rw-r--r--kalarm/lib/timespinbox.cpp4
23 files changed, 70 insertions, 70 deletions
diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp
index 01864012..d1ba243f 100644
--- a/kalarm/lib/buttongroup.cpp
+++ b/kalarm/lib/buttongroup.cpp
@@ -29,25 +29,25 @@
ButtonGroup::ButtonGroup(TQWidget* parent, const char* name)
: TQButtonGroup(parent, name)
{
- connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int)));
}
ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name)
: TQButtonGroup(title, parent, name)
{
- connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name)
+ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name)
: TQButtonGroup(strips, orient, parent, name)
{
- connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name)
+ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name)
: TQButtonGroup(strips, orient, title, parent, name)
{
- connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
+ connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int)));
}
/******************************************************************************
@@ -57,7 +57,7 @@ ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& tit
int ButtonGroup::insert(TQButton* button, int id)
{
id = TQButtonGroup::insert(button, id);
- connect(button, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotButtonToggled(bool)));
+ connect(button, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotButtonToggled(bool)));
return id;
}
diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h
index 1f72bda7..f26ab26d 100644
--- a/kalarm/lib/buttongroup.h
+++ b/kalarm/lib/buttongroup.h
@@ -57,7 +57,7 @@ class ButtonGroup : public TQButtonGroup
* @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0);
+ ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name = 0);
/** Constructor.
* @param strips The number of rows or columns of buttons.
* @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group.
@@ -65,7 +65,7 @@ class ButtonGroup : public TQButtonGroup
* @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0);
+ ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0);
/** Inserts a button in the group.
* This overrides the insert() method of TQButtonGroup, which should really be a virtual method...
* @param button The button to insert.
diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp
index d6b02373..4b29d927 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 ? TQ_NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -58,9 +58,9 @@ void CheckBox::setFocusWidget(TQWidget* w, bool enable)
mFocusWidget = w;
mFocusWidgetEnable = enable;
if (w)
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()));
else
- disconnect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+ disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
}
/******************************************************************************
@@ -86,7 +86,7 @@ void CheckBox::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::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() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQCheckBox::mouseReleaseEvent(e);
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 9d47d504..eb9afc88 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -80,7 +80,7 @@ class CheckBox : public TQCheckBox
protected slots:
void slotClicked();
private:
- TQ_FocusPolicy mFocusPolicy; // default focus policy for the TQCheckBox
+ TQWidget::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 625933c7..d612180a 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -39,9 +39,9 @@ ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defa
mDisabled(false)
{
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()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged()));
+ connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+ connect(this, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotHighlighted(int)));
+ Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_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() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQComboBox::mousePressEvent(e);
diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp
index 99577506..253881f5 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() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQComboBox::mousePressEvent(e);
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 29475f71..862e859f 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -28,7 +28,7 @@
DateEdit::DateEdit(TQWidget* parent, const char* name)
: KDateEdit(parent, name)
{
- connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&)));
+ connect(this, TQ_SIGNAL(dateEntered(const TQDate&)), TQ_SLOT(newDateEntered(const TQDate&)));
}
void DateEdit::setMinDate(const TQDate& d, const TQString& errorDate)
@@ -91,7 +91,7 @@ void DateEdit::mousePressEvent(TQMouseEvent *e)
if (isReadOnly())
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
KDateEdit::mousePressEvent(e);
diff --git a/kalarm/lib/datetime.h b/kalarm/lib/datetime.h
index d75aa94d..6b620494 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(Qt::DateFormat f = Qt::TextDate) const
+ TQString toString(TQt::DateFormat f = TQt::TextDate) const
{
if (mDateOnly)
return mDateTime.date().toString(f);
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index 891213c5..8a41d624 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -50,12 +50,12 @@ Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char
void Label::setBuddy(TQWidget* bud)
{
if (mRadioButton)
- disconnect(mRadioButton, TQT_SIGNAL(destroyed()), this, TQT_SLOT(buddyDead()));
+ disconnect(mRadioButton, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDead()));
TQWidget* w = bud;
if (w)
{
while (w->focusProxy())
- w = TQT_TQWIDGET(w->focusProxy());
+ w = w->focusProxy();
if (!w->inherits("TQRadioButton"))
w = 0;
}
@@ -74,7 +74,7 @@ void Label::setBuddy(TQWidget* bud)
mFocusWidget = new LabelFocusWidget(this);
TQLabel::setBuddy(mFocusWidget);
mRadioButton = (TQRadioButton*)bud;
- connect(mRadioButton, TQT_SIGNAL(destroyed()), this, TQT_SLOT(buddyDead()));
+ connect(mRadioButton, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDead()));
}
}
@@ -106,7 +106,7 @@ void Label::activated()
LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
: TQWidget(parent, name)
{
- setFocusPolicy(TQ_ClickFocus);
+ setFocusPolicy(TQWidget::ClickFocus);
setFixedSize(TQSize(1,1));
}
diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp
index f1f824d2..d47c1d9f 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 ? TQ_NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? TQWidget::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() == Qt::LeftButton)
+ if (e->button() == TQt::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() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQPushButton::mouseReleaseEvent(e);
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index 634f8d89..091060af 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:
- TQ_FocusPolicy mFocusPolicy; // default focus policy for the TQPushButton
+ TQWidget::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 18571ad7..62fb9b63 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 ? TQ_NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -58,9 +58,9 @@ void RadioButton::setFocusWidget(TQWidget* w, bool enable)
mFocusWidget = w;
mFocusWidgetEnable = enable;
if (w)
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()));
else
- disconnect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+ disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
}
/******************************************************************************
@@ -86,7 +86,7 @@ void RadioButton::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::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() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQRadioButton::mouseReleaseEvent(e);
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index c6d95fbc..d3b47785 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -80,7 +80,7 @@ class RadioButton : public TQRadioButton
protected slots:
void slotClicked();
private:
- TQ_FocusPolicy mFocusPolicy; // default focus policy for the TQRadioButton
+ TQWidget::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 1ed64df7..97d89fee 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -56,8 +56,8 @@ bool ShellProcess::start(Communication comm)
return false;
}
KShellProcess::operator<<(mCommand);
- connect(this, TQT_SIGNAL(wroteStdin(TDEProcess*)), TQT_SLOT(writtenStdin(TDEProcess*)));
- connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotExited(TDEProcess*)));
+ connect(this, TQ_SIGNAL(wroteStdin(TDEProcess*)), TQ_SLOT(writtenStdin(TDEProcess*)));
+ connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotExited(TDEProcess*)));
if (!KShellProcess::start(TDEProcess::NotifyOnExit, comm))
{
mStatus = START_FAIL;
@@ -201,7 +201,7 @@ bool ShellProcess::authorised()
{
if (!mInitialised)
{
- mAuthorised = kapp->authorize("shell_access");
+ mAuthorised = tdeApp->authorize("shell_access");
mInitialised = true;
}
return mAuthorised;
diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h
index 316d6ef7..95189e70 100644
--- a/kalarm/lib/shellprocess.h
+++ b/kalarm/lib/shellprocess.h
@@ -23,7 +23,7 @@
/** @file shellprocess.h - execute a process through the shell */
-#include <kprocess.h>
+#include <tdeprocess.h>
/**
diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp
index 189c8941..5ee7a65a 100644
--- a/kalarm/lib/slider.cpp
+++ b/kalarm/lib/slider.cpp
@@ -26,12 +26,12 @@ Slider::Slider(TQWidget* parent, const char* name)
mReadOnly(false)
{ }
-Slider::Slider(Qt::Orientation o, TQWidget* parent, const char* name)
+Slider::Slider(TQt::Orientation o, TQWidget* parent, const char* name)
: TQSlider(o, parent, name),
mReadOnly(false)
{ }
-Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* parent, const char* name)
+Slider::Slider(int minval, int maxval, int pageStep, int value, TQt::Orientation o, TQWidget* parent, const char* name)
: TQSlider(minval, maxval, pageStep, value, o, parent, name),
mReadOnly(false)
{ }
@@ -54,7 +54,7 @@ void Slider::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
return;
}
TQSlider::mousePressEvent(e);
diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h
index bb13dc76..dc36e3ce 100644
--- a/kalarm/lib/slider.h
+++ b/kalarm/lib/slider.h
@@ -50,7 +50,7 @@ class Slider : public TQSlider
* @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit Slider(Qt::Orientation orient, TQWidget* parent = 0, const char* name = 0);
+ explicit Slider(TQt::Orientation orient, TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param minValue The minimum value which the slider can have.
* @param maxValue The maximum value which the slider can have.
@@ -60,7 +60,7 @@ class Slider : public TQSlider
* @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient,
+ Slider(int minValue, int maxValue, int pageStep, int value, TQt::Orientation orient,
TQWidget* parent = 0, const char* name = 0);
/** Returns true if the slider is read only. */
bool isReadOnly() const { return mReadOnly; }
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index 3a2cffc4..667d5c7c 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -65,7 +65,7 @@ void SpinBox::init()
#if KDE_IS_VERSION(3,1,90)
// Detect when the text field is edited
- connect(editor(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textEdited()));
+ connect(editor(), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textEdited()));
#endif
}
@@ -201,7 +201,7 @@ void SpinBox::updateDisplay()
*/
bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
{
- if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(editor()))
+ if (obj == 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() == Qt::LeftButton)
+ if (me->button() == TQt::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() == Qt::LeftButton && mShiftMouse)
+ if (me->button() == TQt::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() & Qt::LeftButton)
+ if (me->state() & TQt::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 & Qt::LeftButton)
+ if ((state & TQt::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 5572cb95..328813e2 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -85,15 +85,15 @@ void SpinBox2::init()
mSpinbox->setSelectOnStep(false); // default
mUpdown2->setSelectOnStep(false); // always false
setFocusProxy(mSpinbox);
- mUpdown2->setFocusPolicy(TQ_NoFocus);
+ mUpdown2->setFocusPolicy(TQWidget::NoFocus);
mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this);
if (!mirrorStyle(style()))
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)));
- connect(mSpinbox, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SIGNAL(valueChanged(const TQString&)));
- connect(mUpdown2, TQT_SIGNAL(stepped(int)), TQT_SLOT(stepPage(int)));
- connect(mUpdown2, TQT_SIGNAL(styleUpdated()), TQT_SLOT(updateMirror()));
+ connect(mSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(valueChange()));
+ connect(mSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(valueChanged(int)));
+ connect(mSpinbox, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SIGNAL(valueChanged(const TQString&)));
+ connect(mUpdown2, TQ_SIGNAL(stepped(int)), TQ_SLOT(stepPage(int)));
+ connect(mUpdown2, TQ_SIGNAL(styleUpdated()), TQ_SLOT(updateMirror()));
}
void SpinBox2::setReadOnly(bool ro)
@@ -451,7 +451,7 @@ void SpinMirror::contentsMouseEvent(TQMouseEvent* e)
{
case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonRelease:
- TQTimer::singleShot(0, this, TQT_SLOT(redraw()));
+ TQTimer::singleShot(0, this, TQ_SLOT(redraw()));
break;
default:
break;
@@ -481,11 +481,11 @@ bool SpinMirror::event(TQEvent* e)
case TQEvent::Leave:
case TQEvent::Enter:
TQApplication::postEvent(mSpinWidget, new TQEvent(e->type()));
- TQTimer::singleShot(0, this, TQT_SLOT(redraw()));
+ TQTimer::singleShot(0, this, TQ_SLOT(redraw()));
break;
case TQEvent::FocusIn:
mSpinbox->setFocus();
- TQTimer::singleShot(0, this, TQT_SLOT(redraw()));
+ TQTimer::singleShot(0, this, TQ_SLOT(redraw()));
break;
default:
break;
diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp
index eecef7d4..e32cf659 100644
--- a/kalarm/lib/synchtimer.cpp
+++ b/kalarm/lib/synchtimer.cpp
@@ -48,11 +48,11 @@ void SynchTimer::connecT(TQObject* receiver, const char* member)
Connection connection(receiver, member);
if (mConnections.find(connection) != mConnections.end())
return; // the slot is already connected, so ignore request
- connect(mTimer, TQT_SIGNAL(timeout()), receiver, member);
+ connect(mTimer, TQ_SIGNAL(timeout()), receiver, member);
mConnections.append(connection);
if (!mTimer->isActive())
{
- connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer()));
+ connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer()));
start();
}
}
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 80713f2f..21215a6c 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -38,13 +38,13 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name)
bool use12hour = TDEGlobal::locale()->use12Clock();
mSpinBox = new TimeSpinBox(!use12hour, this);
mSpinBox->setFixedSize(mSpinBox->sizeHint());
- connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+ connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
if (use12hour)
{
mAmPm = new ComboBox(this);
setAmPmCombo(1, 1); // add "am" and "pm" options to the combo box
mAmPm->setFixedSize(mAmPm->sizeHint());
- connect(mAmPm, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotAmPmChanged(int)));
+ connect(mAmPm, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotAmPmChanged(int)));
}
}
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index 37c78702..b2290a77 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -63,12 +63,12 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
mSpinBox->setLineStep(1);
mSpinBox->setLineShiftStep(10);
mSpinBox->setRange(1, mMaxDays);
- connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDaysChanged(int)));
+ connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDaysChanged(int)));
mSpinStack->addWidget(mSpinBox, 0);
mTimeSpinBox = new TimeSpinBox(0, 99999, mSpinStack);
mTimeSpinBox->setRange(1, maxMinutes); // max 999H59M
- connect(mTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotTimeChanged(int)));
+ connect(mTimeSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotTimeChanged(int)));
mSpinStack->addWidget(mTimeSpinBox, 1);
mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox->sizeHint()));
@@ -88,7 +88,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
mUnitsCombo->insertItem(i18n_weeks());
mMaxUnitShown = WEEKS;
mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint());
- connect(mUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUnitsSelected(int)));
+ connect(mUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUnitsSelected(int)));
setFocusProxy(mUnitsCombo);
setTabOrder(mUnitsCombo, mSpinStack);
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index 0ac932e6..db3d5400 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* parent, const char* name = 0)
- : TQValidator(TQT_TQOBJECT(parent), name),
+ : TQValidator(parent, name),
minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { }
virtual State validate(TQString&, int&) const;
int minMinute, maxMinute;
@@ -70,7 +70,7 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name)
setShiftSteps(5, 360); // shift-left button increments 5 min / 6 hours
setSelectOnStep(false);
setAlignment(TQt::AlignHCenter);
- connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+ connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
}
/******************************************************************************
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-25 17:08:43 +0000