summaryrefslogtreecommitdiffstats
path: root/kalarm/lib
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/lib')
-rw-r--r--kalarm/lib/colourcombo.cpp2
-rw-r--r--kalarm/lib/colourlist.h8
-rw-r--r--kalarm/lib/lineedit.cpp2
-rw-r--r--kalarm/lib/messagebox.cpp2
-rw-r--r--kalarm/lib/shellprocess.cpp2
-rw-r--r--kalarm/lib/spinbox.cpp4
-rw-r--r--kalarm/lib/synchtimer.cpp2
-rw-r--r--kalarm/lib/timespinbox.cpp4
8 files changed, 13 insertions, 13 deletions
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 5cea7fb83..cd078a34f 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -57,7 +57,7 @@ void ColourCombo::setColours(const ColourList& colours)
{
mColourList = colours;
if (mSelectedColour != mCustomColour
- && !mColourList.tqcontains(mSelectedColour))
+ && !mColourList.contains(mSelectedColour))
{
// The current colour has been deleted
mSelectedColour = mColourList.count() ? mColourList.first() : mCustomColour;
diff --git a/kalarm/lib/colourlist.h b/kalarm/lib/colourlist.h
index 91fabaf92..485bba6d7 100644
--- a/kalarm/lib/colourlist.h
+++ b/kalarm/lib/colourlist.h
@@ -83,19 +83,19 @@ class ColourList
/** Returns an iterator pointing to the colour at position @p i in the list. */
const_iterator at(size_type i) const { return mList.at(i); }
/** Returns true if the list contains the colour @p c. */
- size_type tqcontains(const TQColor& c) const { return mList.tqcontains(c.rgb()); }
+ size_type contains(const TQColor& c) const { return mList.contains(c.rgb()); }
/** Returns an iterator pointing to the first occurrence of colour @p c in the list.
* Returns end() if colour @p c is not in the list.
*/
- const_iterator tqfind(const TQColor& c) const { return mList.tqfind(c.rgb()); }
+ const_iterator find(const TQColor& c) const { return mList.find(c.rgb()); }
/** Returns an iterator pointing to the first occurrence of colour @p c in the list, starting.
* from position @p it. Returns end() if colour @p c is not in the list.
*/
- const_iterator tqfind(const_iterator it, const TQColor& c) const { return mList.tqfind(it, c.rgb()); }
+ const_iterator find(const_iterator it, const TQColor& c) const { return mList.find(it, c.rgb()); }
/** 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.tqfindIndex(c.rgb()); }
+ int findIndex(const TQColor& c) const { return mList.findIndex(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/lineedit.cpp b/kalarm/lib/lineedit.cpp
index f19ed8066..28d94fb26 100644
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@@ -181,7 +181,7 @@ void LineEdit::dropEvent(TQDropEvent* e)
}
else
{
- int newline = txt.tqfind('\n');
+ int newline = txt.find('\n');
newText = (newline >= 0) ? txt.left(newline) : txt;
}
}
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index dced4ce6a..2f7480dfd 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -45,7 +45,7 @@ KMessageBox::ButtonCode MessageBox::getContinueDefault(const TQString& dontAskAg
ButtonCode defaultButton = Continue;
if (!dontAskAgainName.isEmpty())
{
- TQMap<TQString, ButtonCode>::ConstIterator it = mContinueDefaults.tqfind(dontAskAgainName);
+ TQMap<TQString, ButtonCode>::ConstIterator it = mContinueDefaults.find(dontAskAgainName);
if (it != mContinueDefaults.end())
defaultButton = it.data();
}
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index c2f2e11bd..09daf91db 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.tqfindRev('/');
+ int i = mShellPath.findRev('/');
if (i >= 0)
mShellName = mShellPath.mid(i + 1);
else
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index fc8e6b7c3..10f3f5917 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -468,9 +468,9 @@ int SpinBox::shiftStepAdjustment(int oldValue, int shiftStep)
*/
int SpinBox::whichButton(const TQPoint& pos)
{
- if (upRect().tqcontains(pos))
+ if (upRect().contains(pos))
return UP;
- if (downRect().tqcontains(pos))
+ if (downRect().contains(pos))
return DOWN;
return NO_BUTTON;
}
diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp
index 7be3c17c2..caed93d7b 100644
--- a/kalarm/lib/synchtimer.cpp
+++ b/kalarm/lib/synchtimer.cpp
@@ -46,7 +46,7 @@ SynchTimer::~SynchTimer()
void SynchTimer::connecT(TQObject* receiver, const char* member)
{
Connection connection(receiver, member);
- if (mConnections.tqfind(connection) != mConnections.end())
+ if (mConnections.find(connection) != mConnections.end())
return; // the slot is already connected, so ignore request
connect(mTimer, TQT_SIGNAL(timeout()), receiver, member);
mConnections.append(connection);
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index 1a2a65008..ccf0c4492 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -124,7 +124,7 @@ TQString TimeSpinBox::mapValueToText(int v)
int TimeSpinBox::mapTextToValue(bool* ok)
{
TQString text = cleanText();
- int colon = text.tqfind(':');
+ int colon = text.find(':');
if (colon >= 0)
{
// [h]:m format for any time value
@@ -309,7 +309,7 @@ TQValidator::State TimeSpinBox::TimeValidator::validate(TQString& text, int& /*c
bool ok;
int hr = 0;
int mn = 0;
- int colon = cleanText.tqfind(':');
+ int colon = cleanText.find(':');
if (colon >= 0)
{
TQString minute = cleanText.mid(colon + 1);