summaryrefslogtreecommitdiffstats
path: root/kicker-applets
diff options
context:
space:
mode:
Diffstat (limited to 'kicker-applets')
-rw-r--r--kicker-applets/kbinaryclock/kbinaryclock.cpp24
-rw-r--r--kicker-applets/kbinaryclock/settings.ui2
-rw-r--r--kicker-applets/kolourpicker/kolourpicker.cpp2
-rw-r--r--kicker-applets/kolourpicker/simplebutton.cpp4
-rw-r--r--kicker-applets/ktimemon/sample.cc36
-rw-r--r--kicker-applets/ktimemon/timemon.cc12
-rw-r--r--kicker-applets/math/parser.cpp20
-rw-r--r--kicker-applets/mediacontrol/kscdInterface.cpp8
-rw-r--r--kicker-applets/mediacontrol/mediacontrol.cpp2
-rw-r--r--kicker-applets/mediacontrol/mpdInterface.cpp14
-rw-r--r--kicker-applets/mediacontrol/simplebutton.cpp4
11 files changed, 64 insertions, 64 deletions
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 6acd08b..f46b4a0 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -68,7 +68,7 @@ SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Setting
* Update the preview
*/
void SettingsImp::updatePreview(){
- int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
+ int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
int look = KLed::Raised;
look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look;
look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look;
@@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){
kLed5->setBackgroundColor(backgroundColor);
kLed6->setBackgroundColor(backgroundColor);
- kLed1->setShape((KLed::Shape)tqshape);
- kLed2->setShape((KLed::Shape)tqshape);
- kLed3->setShape((KLed::Shape)tqshape);
- kLed4->setShape((KLed::Shape)tqshape);
- kLed5->setShape((KLed::Shape)tqshape);
- kLed6->setShape((KLed::Shape)tqshape);
+ kLed1->setShape((KLed::Shape)shape);
+ kLed2->setShape((KLed::Shape)shape);
+ kLed3->setShape((KLed::Shape)shape);
+ kLed4->setShape((KLed::Shape)shape);
+ kLed5->setShape((KLed::Shape)shape);
+ kLed6->setShape((KLed::Shape)shape);
kLed1->setColor(color);
kLed2->setColor(color);
@@ -173,7 +173,7 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) {
* Load the settings for the clock.
*/
void KBinaryClock::loadSettings(){
- int tqshape = prefs->shape();
+ int shape = prefs->shape();
int look = prefs->look();
TQColor color = prefs->color();
@@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){
}
for(int i=0; i < 4; i++){
for(int j=0; j < ledWidth;j++){
- ledMatrix[j][i]->setShape((KLed::Shape)tqshape);
+ ledMatrix[j][i]->setShape((KLed::Shape)shape);
ledMatrix[j][i]->setColor(color);
ledMatrix[j][i]->setLook((KLed::Look)look);
ledMatrix[j][i]->setDarkFactor(darkFactor);
@@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() {
proc << locate("exe", "tdesu");
proc << "--nonewdcop";
proc << TQString("%1 clock --lang %2")
- .tqarg(locate("exe", "kcmshell"))
- .tqarg(KGlobal::locale()->language());
+ .arg(locate("exe", "kcmshell"))
+ .arg(KGlobal::locale()->language());
proc.start(KProcess::DontCare);
break;
case 104:
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
{
- tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
+ tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
}
#include "kbinaryclock.moc"
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 2ebb466..7f21dec 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -110,7 +110,7 @@
<property name="text">
<string>Dark</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index fbce8cf..9acfc26 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -140,7 +140,7 @@ void KolourPicker::slotHistory()
TQPopupMenu *sub = copyPopup(*it, false);
subMenus.append(sub);
popup.insertItem(colorPixmap(*it),
- TQString("%1, %2, %3").tqarg((*it).red()).tqarg((*it).green()).tqarg((*it).blue()),
+ TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()),
sub);
}
popup.insertSeparator();
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index f5239bd..4760982 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
{
m_highlight = true;
- tqrepaint( false );
+ repaint( false );
TQButton::enterEvent( e );
}
@@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
{
m_highlight = false;
- tqrepaint( false );
+ repaint( false );
TQButton::enterEvent( e );
}
diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc
index 54d1edf..99ea20b 100644
--- a/kicker-applets/ktimemon/sample.cc
+++ b/kicker-applets/ktimemon/sample.cc
@@ -102,7 +102,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
KMessageBox::error(timemon,
i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n"
"This file is required to determine current memory usage.\n"
- "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+ "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno)));
exit(1);
}
@@ -112,7 +112,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
KMessageBox::error(timemon,
i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n"
"This file is required to determine current system info. "
- "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+ "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno)));
exit(1);
}
@@ -125,7 +125,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
"The diagnostics are:\n%1.\n"
"Are you really running Solaris? "
"Please contact the maintainer at mueller@kde.org "
- "who will try to figure out what went wrong.").tqarg(strerror(errno)));
+ "who will try to figure out what went wrong.").arg(strerror(errno)));
exit(1);
}
#endif
@@ -210,7 +210,7 @@ void KSample::readSample()
if ((l = read(memFD, buffer, sizeof(buffer) - 1)) < 0)
{
fatal(i18n("Unable to read the memory usage file '%1'.\n"
- "The diagnostics are: %2").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+ "The diagnostics are: %2").arg(MEMINFO_NAME).arg(strerror(errno)));
}
buffer[l] = '\0';
l = 0;
@@ -223,7 +223,7 @@ void KSample::readSample()
"different file format than expected.\n"
"Maybe your version of the proc filesystem is "
"incompatible with supported versions. "
- "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").tqarg(MEMINFO_NAME));
+ "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").arg(MEMINFO_NAME));
l++;
}
@@ -237,7 +237,7 @@ void KSample::readSample()
lseek(statFD, 0, 0);
if ((l = read(statFD, buffer, sizeof(buffer)-1)) < 0)
fatal(i18n("Unable to read the system usage file '%1'.\n"
- "The diagnostics are: %2").tqarg(STAT_NAME).tqarg(strerror(errno)));
+ "The diagnostics are: %2").arg(STAT_NAME).arg(strerror(errno)));
buffer[l] = '\0';
@@ -271,7 +271,7 @@ void KSample::readSample()
struct tbl_sysinfo sysinfo;
if (table(TBL_SYSINFO, 0, &sysinfo, 1, sizeof(sysinfo)) != 1)
- fatal(msg.tqarg("TBL_SYSINFO"));
+ fatal(msg.arg("TBL_SYSINFO"));
sample.user = sysinfo.si_user;
sample.nice = sysinfo.si_nice;
@@ -281,7 +281,7 @@ void KSample::readSample()
struct tbl_vmstats vmstats;
if (table(TBL_VMSTATS, 0, &vmstats, 1, sizeof(vmstats)) != 1)
- fatal(msg.tqarg("TBL_VMSTATS"));
+ fatal(msg.arg("TBL_VMSTATS"));
sample.mtotal = vmstats.free_count + vmstats.active_count +
vmstats.inactive_count + vmstats.wire_count;
@@ -291,7 +291,7 @@ void KSample::readSample()
struct tbl_swapinfo swapinfo;
if (table(TBL_SWAPINFO, -1, &swapinfo, 1, sizeof(swapinfo)) != 1)
- fatal(msg.tqarg("TBL_SWAPINFO"));
+ fatal(msg.arg("TBL_SWAPINFO"));
sample.stotal = swapinfo.size;
sample.sfree = swapinfo.free;
@@ -324,7 +324,7 @@ void KSample::readSample()
kstat_read(kc, ksp, &cstat) == -1) // and read into buffer
fatal(i18n("Unable to read the CPU statistics entry "
"from the 'kstat' library. The diagnostics are '%1'.\n"
- "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+ "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
// fields are: idle user kernel iowait (no nice info?)
sample.user += cstat.cpu_sysinfo.cpu[1] / sample.cpus;
@@ -338,7 +338,7 @@ void KSample::readSample()
fatal(i18n("The number of CPUs appears to have changed at "
"very short notice, or the 'kstat' library returns "
"inconsistent results (%1 vs. %2 CPUs).\n"
- "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(sample.cpus).tqarg(cpus));
+ "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(sample.cpus).arg(cpus));
// availrmem = pages of core for user-proc ( == physmem - kernelmem)
// freemem = no of free pages
@@ -350,7 +350,7 @@ void KSample::readSample()
fatal(i18n("Unable to read the memory statistics entry "
"from the 'kstat' library. The diagnostics are '%1'\n"
"You might want to contact the maintainer at "
- "http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+ "http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
int i;
unsigned long physmem = 0, freemem = 0, availrmem = 0;
@@ -367,7 +367,7 @@ void KSample::readSample()
fatal(i18n("There seems to be a problem with KTimeMon's handling "
"of the 'kstat' library: 0 bytes of physical memory determined!\n"
"Free memory is %1, available memory is %2.\n"
- "Please contact the maintainer at mueller@kde.org who will try to sort this out.").tqarg(freemem).tqarg(availrmem));
+ "Please contact the maintainer at mueller@kde.org who will try to sort this out.").arg(freemem).arg(availrmem));
sample.mtotal = physmem;
sample.free = freemem;
@@ -378,7 +378,7 @@ void KSample::readSample()
if ((swapentries = swapctl(SC_GETNSWP, 0)) == -1)
fatal(i18n("Unable to determine the number of "
"swap spaces. The diagnostics are '%1'.\n"
- "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+ "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
if (swapentries != 0) {
// 2* to get some space for padding??
@@ -389,8 +389,8 @@ void KSample::readSample()
"trying to determine the swap usage.\n"
"Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n"
"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.")
- .tqarg(2 * sizeof(int) + swapentries * sizeof(struct swapent))
- .tqarg(sizeof(int)).tqarg(swapentries).tqarg(sizeof(struct swapent)));
+ .arg(2 * sizeof(int) + swapentries * sizeof(struct swapent))
+ .arg(sizeof(int)).arg(swapentries).arg(sizeof(struct swapent)));
char path[1024];
stbl->swt_n = swapentries;
@@ -399,7 +399,7 @@ void KSample::readSample()
if ((swapentries = swapctl(SC_LIST, stbl)) == -1)
fatal(i18n("Unable to determine the swap usage.\n"
"The diagnostics are '%1'.\n"
- "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+ "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
if (!warned && swapentries != stbl->swt_n) {
@@ -407,7 +407,7 @@ void KSample::readSample()
nonfatal(i18n("Information was requested for "
"%1 swap spaces, but only %2 swap entries were returned.\n"
"KTimeMon will attempt to continue.\n"
- "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(stbl->swt_n).tqarg(swapentries));
+ "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(stbl->swt_n).arg(swapentries));
}
for (i = 0; i < swapentries; i++) {
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index f0cc61a..991a2e9 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -171,11 +171,11 @@ void KTimeMon::maybeTip(const TQPoint& p)
if ( idle < 0 )
idle = 0;
TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free")
- .tqarg(idle)
- .tqarg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0))
- .tqarg(100-s.used)
- .tqarg(KGlobal::locale()->formatNumber(s.stotal, 0))
- .tqarg(100-s.sused);
+ .arg(idle)
+ .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0))
+ .arg(100-s.used)
+ .arg(KGlobal::locale()->formatNumber(s.stotal, 0))
+ .arg(100-s.sused);
tip(rect(), str);
}
@@ -337,7 +337,7 @@ void KTimeMon::writeConfiguration()
conf->sync();
}
-// Make the KSample object update its internal sample and tqrepaint the
+// Make the KSample object update its internal sample and repaint the
// object.
void KTimeMon::timeout()
{
diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp
index e1dee3e..8a58064 100644
--- a/kicker-applets/math/parser.cpp
+++ b/kicker-applets/math/parser.cpp
@@ -656,41 +656,41 @@ int Parser::getfix(TQString name)
int Parser::errmsg()
{ switch(err)
{ case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Syntax error").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "Syntax error").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Missing parenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Function name unknown").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Void function variable").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Too many functions").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Token-memory overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Stack overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Name of function not free").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "Name of function not free").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "recursive function not allowed").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+ "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
break;
- case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).tqarg(TQString::number(errpos)),
+ case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)),
i18n("Math Expression Evaluator"));
break;
case 11: KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator"));
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 916c0e1..6621c53 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const
}
else
{
- result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title);
+ result = i18n("artist - trackname", "%1 - %2").arg(artist, title);
}
}
}
@@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const
}
else
{
- result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title);
+ result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title);
}
}
else // artist is non-empty
{
if(title.isEmpty())
{
- result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album);
+ result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album);
}
else
{
- result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title);
+ result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title);
}
}
}
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index ac32064..95cf81c 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -424,7 +424,7 @@ void MediaControl::reparseConfig()
{
KNotifyClient::event(winId(), KNotifyClient::warning,
i18n("There was trouble loading theme %1. Please choose" \
- " a different theme.").tqarg(skindir));
+ " a different theme.").arg(skindir));
// default to kde-icons, they have to be installed :)
slotIconChanged();
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index b17afa3..98ba0cb 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -137,10 +137,10 @@ void MpdInterface::connectionError(int e)
switch (e)
{
case TQSocket::ErrConnectionRefused:
- message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port);
+ message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port);
break;
case TQSocket::ErrHostNotFound:
- message=i18n("Host '%1' not found.").tqarg(hostname);
+ message=i18n("Host '%1' not found.").arg(hostname);
break;
case TQSocket::ErrSocketRead:
message=i18n("Error reading socket.");
@@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec)
if (songid>-1)
{
- if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1()))
+ if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1()))
{
fetchOk(); // unlocks
}
@@ -366,7 +366,7 @@ void MpdInterface::changeVolume(int delta)
volume+=delta;
if (volume<0) volume=0;
if (volume>100) volume=100;
- if (dispatch(TQString("setvol %1\n").tqarg(volume).latin1()))
+ if (dispatch(TQString("setvol %1\n").arg(volume).latin1()))
{
fetchOk();
}
@@ -433,7 +433,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
// found song, so lets play it
if (songid>-1)
{
- if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1()))
+ if (dispatch((TQString("playid %1\n").arg(songid)).latin1()))
{
if (fetchOk()) list.pop_front();
return;
@@ -491,7 +491,7 @@ const TQString MpdInterface::getTrackTitle() const
if (!(songid>-1)) return result;
- if (!dispatch(TQString("playlistid %1\n").tqarg(songid).latin1()))
+ if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1()))
return result;
TQString artist;
@@ -559,7 +559,7 @@ const TQString MpdInterface::getTrackTitle() const
else
return album;
}
- return i18n("No tags: %1").tqarg(file);
+ return i18n("No tags: %1").arg(file);
}
int MpdInterface::playingStatus()
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index f5239bd..4760982 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
{
m_highlight = true;
- tqrepaint( false );
+ repaint( false );
TQButton::enterEvent( e );
}
@@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
{
m_highlight = false;
- tqrepaint( false );
+ repaint( false );
TQButton::enterEvent( e );
}