summaryrefslogtreecommitdiffstats
path: root/kmix/kmixapplet.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:25 -0600
commitf59dfa08651a47f21d004e8e4cb5020b8035287e (patch)
tree0582273566661474af14fe8f1737cfe1e6527d46 /kmix/kmixapplet.cpp
parent83fbc82a101309e171089f0d5ed080f82a367345 (diff)
downloadtdemultimedia-f59dfa08651a47f21d004e8e4cb5020b8035287e.tar.gz
tdemultimedia-f59dfa08651a47f21d004e8e4cb5020b8035287e.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.
Diffstat (limited to 'kmix/kmixapplet.cpp')
-rw-r--r--kmix/kmixapplet.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 871c47a7..741cbd0e 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -27,7 +27,7 @@
#include <tqgroupbox.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
@@ -205,8 +205,8 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
// No mixer set by user (kmixappletrc_*) and more than one to choose
// We do NOT know which mixer to use => ask the User
m_errorLabel = new TQPushButton( i18n("Select Mixer"), this );
- m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(), m_errorLabel->sizeHint().height() );
- resize( m_errorLabel->sizeHint() );
+ m_errorLabel->setGeometry(0, 0, m_errorLabel->tqsizeHint().width(), m_errorLabel->tqsizeHint().height() );
+ resize( m_errorLabel->tqsizeHint() );
connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) );
}
else {
@@ -375,7 +375,7 @@ void KMixApplet::positionChange(Position pos) {
loadConfig();
setColors();
- const TQSize panelAppletConstrainedSize = sizeHint();
+ const TQSize panelAppletConstrainedSize = tqsizeHint();
m_mixerWidget->setGeometry( 0, 0, panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
resize( panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
//setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
@@ -401,7 +401,7 @@ void KMixApplet::resizeEvent(TQResizeEvent *e)
}
- // resizing changes our own sizeHint(), because we must take the new PanelSize in account.
+ // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account.
// So updateGeometry() is amust for us.
//kdDebug(67100) << "KMixApplet::resizeEvent(). UPDATE GEOMETRY" << endl;
updateGeometry();
@@ -414,21 +414,21 @@ void KMixApplet::updateGeometrySlot() {
}
-TQSize KMixApplet::sizeHint() const {
- //kdDebug(67100) << "KMixApplet::sizeHint()\n";
+TQSize KMixApplet::tqsizeHint() const {
+ //kdDebug(67100) << "KMixApplet::tqsizeHint()\n";
TQSize qsz;
if ( m_errorLabel !=0 ) {
- qsz = m_errorLabel->sizeHint();
+ qsz = m_errorLabel->tqsizeHint();
}
else if ( m_mixerWidget != 0) {
- qsz = m_mixerWidget->sizeHint();
+ qsz = m_mixerWidget->tqsizeHint();
}
else {
// During construction of m_mixerWidget or if something goes wrong:
- // Return something that should resemble our former sizeHint().
+ // Return something that should resemble our former tqsizeHint().
qsz = size();
}
- //kdDebug(67100) << "KMixApplet::sizeHint() leftright =" << qsz << "\n";
+ //kdDebug(67100) << "KMixApplet::tqsizeHint() leftright =" << qsz << "\n";
return qsz;
}
@@ -437,12 +437,12 @@ TQSize KMixApplet::sizeHint() const {
using this method. Actually we ignore the passed paramater and just return our preferred size.
*/
int KMixApplet::widthForHeight(int) const {
- //kdDebug(67100) << "KMixApplet::widthForHeight() = " << sizeHint().width() << endl;
- return sizeHint().width();
+ //kdDebug(67100) << "KMixApplet::widthForHeight() = " << tqsizeHint().width() << endl;
+ return tqsizeHint().width();
}
int KMixApplet::heightForWidth(int) const {
- //kdDebug(67100) << "KMixApplet::heightForWidth() = " << sizeHint().height() << endl;
- return sizeHint().height();
+ //kdDebug(67100) << "KMixApplet::heightForWidth() = " << tqsizeHint().height() << endl;
+ return tqsizeHint().height();
}