summaryrefslogtreecommitdiffstats
path: root/amarok/src/konquisidebar
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:55:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:55:29 -0600
commit708e0debf366cbe6a2c966a3127ba82a9fdc07e5 (patch)
tree07f554e6804d9f39c420329bee10497248886c41 /amarok/src/konquisidebar
parent2d3d921590b44ae1e8864104f3e36d022bec0308 (diff)
downloadamarok-708e0debf366cbe6a2c966a3127ba82a9fdc07e5.tar.gz
amarok-708e0debf366cbe6a2c966a3127ba82a9fdc07e5.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 2d3d921590b44ae1e8864104f3e36d022bec0308.
Diffstat (limited to 'amarok/src/konquisidebar')
-rw-r--r--amarok/src/konquisidebar/universalamarok.cpp8
-rw-r--r--amarok/src/konquisidebar/universalamarok.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index 78c5437b..083b6b40 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -29,7 +29,7 @@
#include <tqwidget.h>
#include <kglobal.h>
#include <kstandarddirs.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <dcopclient.h>
#include <kmessagebox.h>
@@ -123,7 +123,7 @@ UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widg
fileInfo = new TQFileInfo(HTML_FILE);
TQTimer *t = new TQTimer( this );
- connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updateStatus() ) );
+ connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updatetqStatus() ) );
t->start( 2000, false );
kdDebug() << "Connecting widget signal" << endl;
@@ -208,9 +208,9 @@ void UniversalAmarok::updateBrowser(const TQString& file)
/*!
- \fn UniversalAmarok::updateStatus()
+ \fn UniversalAmarok::updatetqStatus()
*/
-void UniversalAmarok::updateStatus()
+void UniversalAmarok::updatetqStatus()
{
checkForAmarok();
vol_slider->setValue( playerStub->getVolume() );
diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h
index 9c2ee242..f033101d 100644
--- a/amarok/src/konquisidebar/universalamarok.h
+++ b/amarok/src/konquisidebar/universalamarok.h
@@ -84,7 +84,7 @@ private:
public slots:
void updateBrowser(const TQString&);
- void updateStatus();
+ void updatetqStatus();
void sendPrev() { checkForAmarok(); playerStub->prev(); }
void sendPlay() { checkForAmarok(); playerStub->play(); }
void sendPause() { checkForAmarok(); playerStub->pause(); }