aboutsummaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-03-11 18:46:25 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-03-11 18:46:25 +0000
commit013ee07b55a3738b28b5d46324392d8498b50f2b (patch)
tree50979d3872a15fd3e25a746418da0f56c8e8dadd /src/ui
parent542c1d2d3a26ce23b1d0668011b420db231334d2 (diff)
downloadqmmp-013ee07b55a3738b28b5d46324392d8498b50f2b.tar.gz
qmmp-013ee07b55a3738b28b5d46324392d8498b50f2b.tar.bz2
qmmp-013ee07b55a3738b28b5d46324392d8498b50f2b.zip
removed obsolete members
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1619 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/balancebar.cpp2
-rw-r--r--src/ui/balancebar.h2
-rw-r--r--src/ui/builtincommandlineoption.cpp2
-rw-r--r--src/ui/button.cpp8
-rw-r--r--src/ui/configdialog.cpp18
-rw-r--r--src/ui/cursorimage.cpp2
-rw-r--r--src/ui/display.cpp4
-rw-r--r--src/ui/display.h2
-rw-r--r--src/ui/dock.cpp8
-rw-r--r--src/ui/eqslider.cpp2
-rw-r--r--src/ui/eqslider.h2
-rw-r--r--src/ui/eqtitlebar.cpp2
-rw-r--r--src/ui/eqwidget.cpp4
-rw-r--r--src/ui/eqwidget.h2
-rw-r--r--src/ui/keyboardmanager.cpp2
-rw-r--r--src/ui/keyboardmanager.h4
-rw-r--r--src/ui/listwidget.cpp14
-rw-r--r--src/ui/mainvisual.cpp58
-rw-r--r--src/ui/mainwindow.cpp18
-rw-r--r--src/ui/playlist.cpp6
-rw-r--r--src/ui/playlist.h2
-rw-r--r--src/ui/playlistbrowser.cpp4
-rw-r--r--src/ui/playlistselector.cpp6
-rw-r--r--src/ui/playlistslider.cpp4
-rw-r--r--src/ui/playlisttitlebar.cpp4
-rw-r--r--src/ui/popupsettings.cpp2
-rw-r--r--src/ui/popupwidget.cpp6
-rw-r--r--src/ui/positionbar.cpp2
-rw-r--r--src/ui/positionbar.h2
-rw-r--r--src/ui/shadedbar.cpp2
-rw-r--r--src/ui/skinreader.cpp8
-rw-r--r--src/ui/textscroller.cpp10
-rw-r--r--src/ui/timeindicator.cpp2
-rw-r--r--src/ui/titlebar.cpp2
-rw-r--r--src/ui/titlebarcontrol.cpp2
-rw-r--r--src/ui/togglebutton.cpp4
-rw-r--r--src/ui/visualmenu.cpp2
-rw-r--r--src/ui/volumebar.cpp2
-rw-r--r--src/ui/volumebar.h2
39 files changed, 115 insertions, 115 deletions
diff --git a/src/ui/balancebar.cpp b/src/ui/balancebar.cpp
index 508cf9f19..2984577aa 100644
--- a/src/ui/balancebar.cpp
+++ b/src/ui/balancebar.cpp
@@ -45,7 +45,7 @@ BalanceBar::~BalanceBar()
void BalanceBar::mousePressEvent(QMouseEvent *e)
{
- m_moving = TRUE;
+ m_moving = true;
press_pos = e->x();
if(m_pos<e->x() && e->x()<m_pos+11*m_skin->ratio())
{
diff --git a/src/ui/balancebar.h b/src/ui/balancebar.h
index 508603bc1..4e8af0b5e 100644
--- a/src/ui/balancebar.h
+++ b/src/ui/balancebar.h
@@ -54,7 +54,7 @@ private:
int m_max, m_min, m_pos, m_value, m_old;
QPixmap m_pixmap;
int convert(int); // value = convert(position);
- void draw(bool pressed = TRUE);
+ void draw(bool pressed = true);
protected:
void mousePressEvent(QMouseEvent*);
diff --git a/src/ui/builtincommandlineoption.cpp b/src/ui/builtincommandlineoption.cpp
index 5c3d51ebc..3a51d7190 100644
--- a/src/ui/builtincommandlineoption.cpp
+++ b/src/ui/builtincommandlineoption.cpp
@@ -47,7 +47,7 @@ bool BuiltinCommandLineOption::identify(const QString & str) const
str == "--toggle-visibility" ||
str == "--add-file" ||
str == "--add-dir")
- return TRUE;
+ return true;
return FALSE;
}
diff --git a/src/ui/button.cpp b/src/ui/button.cpp
index 742cf0907..18279b0e0 100644
--- a/src/ui/button.cpp
+++ b/src/ui/button.cpp
@@ -56,8 +56,8 @@ void Button::setON (bool on)
}
void Button::mousePressEvent (QMouseEvent *e)
{
- setON (TRUE);
- m_cursorin = TRUE;
+ setON (true);
+ m_cursorin = true;
QWidget::mousePressEvent(e);
}
@@ -71,8 +71,8 @@ void Button::mouseReleaseEvent (QMouseEvent*)
void Button::mouseMoveEvent (QMouseEvent *e)
{
if ( !m_cursorin && rect().contains(e->pos()) ) {
- m_cursorin = TRUE;
- setON (TRUE);
+ m_cursorin = true;
+ setON (true);
} else if ( m_cursorin && !rect().contains(e->pos()) ) {
m_cursorin = FALSE;
setON (FALSE);
diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp
index 933769a6e..061245957 100644
--- a/src/ui/configdialog.cpp
+++ b/src/ui/configdialog.cpp
@@ -93,7 +93,7 @@ void ConfigDialog::readSettings()
ui.per20CheckBox->setChecked(player->playListManager()->convertTwenty());
}
ui.protocolCheckBox->setChecked(settings.value ("PlayList/show_protocol", FALSE).toBool());
- ui.numbersCheckBox->setChecked(settings.value ("PlayList/show_numbers", TRUE).toBool());
+ ui.numbersCheckBox->setChecked(settings.value ("PlayList/show_numbers", true).toBool());
ui.playlistsCheckBox->setChecked(settings.value("PlayList/show_plalists", FALSE).toBool());
ui.popupCheckBox->setChecked(settings.value("PlayList/show_popup", FALSE).toBool());
QmmpSettings *gs = QmmpSettings::instance();
@@ -126,7 +126,7 @@ void ConfigDialog::readSettings()
//resume playback
ui.continuePlaybackCheckBox->setChecked(settings.value("General/resume_on_startup", FALSE).toBool());
//cover options
- ui.coverIncludeLineEdit->setText(gs->coverNameFilters(TRUE).join(","));
+ ui.coverIncludeLineEdit->setText(gs->coverNameFilters(true).join(","));
ui.coverExcludeLineEdit->setText(gs->coverNameFilters(FALSE).join(","));
ui.coverDepthSpinBox->setValue(gs->coverSearchDepth());
ui.useCoverFilesCheckBox->setChecked(gs->useCoverFiles());
@@ -216,7 +216,7 @@ void ConfigDialog::findSkins(const QString &path)
void ConfigDialog::loadPluginsInfo()
{
- ui.treeWidget->blockSignals(TRUE);
+ ui.treeWidget->blockSignals(true);
/*
load transport plugin information
*/
@@ -226,7 +226,7 @@ void ConfigDialog::loadPluginsInfo()
for (int i = 0; i < transports->count (); ++i)
new PluginItem (item, transports->at(i), files.at (i));
ui.treeWidget->addTopLevelItem(item);
- item->setExpanded(TRUE);
+ item->setExpanded(true);
/*
load input plugins information
@@ -237,7 +237,7 @@ void ConfigDialog::loadPluginsInfo()
for (int i = 0; i < decoders->count (); ++i)
new PluginItem (item, decoders->at(i), files.at (i));
ui.treeWidget->addTopLevelItem(item);
- item->setExpanded(TRUE);
+ item->setExpanded(true);
/*
load audio engines information
*/
@@ -247,7 +247,7 @@ void ConfigDialog::loadPluginsInfo()
for (int i = 0; i < engines->count (); ++i)
new PluginItem (item, engines->at(i), files.at (i));
ui.treeWidget->addTopLevelItem(item);
- item->setExpanded(TRUE);
+ item->setExpanded(true);
/*
load effect plugin information
*/
@@ -257,7 +257,7 @@ void ConfigDialog::loadPluginsInfo()
for (int i = 0; i < effects->count (); ++i)
new PluginItem (item, effects->at(i), files.at (i));
ui.treeWidget->addTopLevelItem(item);
- item->setExpanded(TRUE);
+ item->setExpanded(true);
/*
load visual plugin information
*/
@@ -267,7 +267,7 @@ void ConfigDialog::loadPluginsInfo()
for (int i = 0; i < visuals->count (); ++i)
new PluginItem (item, visuals->at(i), files.at (i));
ui.treeWidget->addTopLevelItem(item);
- item->setExpanded(TRUE);
+ item->setExpanded(true);
/*
load general plugin information
*/
@@ -277,7 +277,7 @@ void ConfigDialog::loadPluginsInfo()
for (int i = 0; i < generals->count (); ++i)
new PluginItem (item, generals->at(i), files.at (i));
ui.treeWidget->addTopLevelItem(item);
- item->setExpanded(TRUE);
+ item->setExpanded(true);
ui.treeWidget->blockSignals(FALSE);
ui.treeWidget->resizeColumnToContents(0);
diff --git a/src/ui/cursorimage.cpp b/src/ui/cursorimage.cpp
index 96637728d..2dbe1353b 100644
--- a/src/ui/cursorimage.cpp
+++ b/src/ui/cursorimage.cpp
@@ -110,7 +110,7 @@ QCursor createCursor(QString path)
// now we need the mask (transparency)
QByteArray maskData = bmpData.right((width * height) / 8);
- QImage maskImage = QBitmap::fromData(QSize(width, height), (const uchar*) maskData.constData(), QImage::Format_Mono).toImage().mirrored(FALSE, TRUE);
+ QImage maskImage = QBitmap::fromData(QSize(width, height), (const uchar*) maskData.constData(), QImage::Format_Mono).toImage().mirrored(FALSE, true);
maskImage.invertPixels();
pix.setMask(QBitmap::fromImage(maskImage));
diff --git a/src/ui/display.cpp b/src/ui/display.cpp
index c8c619541..82a0edc89 100644
--- a/src/ui/display.cpp
+++ b/src/ui/display.cpp
@@ -51,7 +51,7 @@ MainDisplay::MainDisplay (QWidget *parent)
m_mw = qobject_cast<MainWindow*>(parent);
m_titlebar = new TitleBar(this);
m_titlebar->move(0,0);
- m_titlebar->setActive(TRUE);
+ m_titlebar->setActive(true);
m_previous = new Button (this, Skin::BT_PREVIOUS_N, Skin::BT_PREVIOUS_P, Skin::CUR_NORMAL);
m_previous->setToolTip(tr("Previous"));
connect (m_previous, SIGNAL (clicked()), parent, SLOT (previous()));
@@ -172,7 +172,7 @@ void MainDisplay::setState(Qmmp::State state)
{
case Qmmp::Playing:
m_playstatus->setStatus(PlayStatus::PLAY);
- m_timeIndicator->setNeedToShowTime(TRUE);
+ m_timeIndicator->setNeedToShowTime(true);
setDuration(m_core->totalTime());
break;
case Qmmp::Paused:
diff --git a/src/ui/display.h b/src/ui/display.h
index c776d01db..7f1541081 100644
--- a/src/ui/display.h
+++ b/src/ui/display.h
@@ -61,7 +61,7 @@ public:
bool isShuffle()const;
void setIsRepeatable(bool);
void setIsShuffle(bool);
- void setMinimalMode(bool b = TRUE);
+ void setMinimalMode(bool b = true);
void setActive(bool b);
public slots:
diff --git a/src/ui/dock.cpp b/src/ui/dock.cpp
index c41173710..d5d373e86 100644
--- a/src/ui/dock.cpp
+++ b/src/ui/dock.cpp
@@ -215,25 +215,25 @@ bool Dock::isDocked (QWidget* mv, QWidget* st)
int nx = mv->x() - st->x();
int ny = abs (mv->y() - st->y() + mv->height());
if (ny < 2 && nx > -mv->width() && nx < st->width()) //above
- return TRUE;
+ return true;
/***********/
nx = mv->x() - st->x();
ny = abs (mv->y() - st->y() - st->height());
if (ny < 2 && nx > -mv->width() && nx < st->width()) //near
- return TRUE;
+ return true;
/**************/
nx = abs (mv->x() - st->x() + mv->width());
ny = mv->y() - st->y();
if (nx < 2 && ny > -mv->height() && ny < st->height()) //left
- return TRUE;
+ return true;
/*****************/
nx = abs (mv->x() - st->x() - st->width());
ny = mv->y() - st->y();
if (nx < 2 && ny > -mv->height() && ny < st->height()) //right
- return TRUE;
+ return true;
return FALSE;
}
diff --git a/src/ui/eqslider.cpp b/src/ui/eqslider.cpp
index 4c3ef0a05..1ddf7699b 100644
--- a/src/ui/eqslider.cpp
+++ b/src/ui/eqslider.cpp
@@ -45,7 +45,7 @@ EqSlider::~EqSlider()
void EqSlider::mousePressEvent(QMouseEvent *e)
{
- m_moving = TRUE;
+ m_moving = true;
press_pos = e->y();
if (m_pos<e->y() && e->y()<m_pos+11*m_skin->ratio())
{
diff --git a/src/ui/eqslider.h b/src/ui/eqslider.h
index a766c575c..0a36a16ee 100644
--- a/src/ui/eqslider.h
+++ b/src/ui/eqslider.h
@@ -56,7 +56,7 @@ private:
double m_max, m_min, m_pos, m_value, m_old;
QPixmap m_pixmap;
double convert(int); // value = convert(position);
- void draw(bool pressed = TRUE);
+ void draw(bool pressed = true);
protected:
void mousePressEvent(QMouseEvent*);
diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp
index ea0bd1c8b..97d2626cb 100644
--- a/src/ui/eqtitlebar.cpp
+++ b/src/ui/eqtitlebar.cpp
@@ -48,7 +48,7 @@ EqTitleBar::EqTitleBar(QWidget *parent)
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
if (settings.value("Equalizer/shaded", FALSE).toBool())
shade();
- m_align = TRUE;
+ m_align = true;
setActive(FALSE);
setCursor(m_skin->getCursor(Skin::CUR_EQTITLE));
connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin()));
diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp
index 092786d2a..d84de2c37 100644
--- a/src/ui/eqwidget.cpp
+++ b/src/ui/eqwidget.cpp
@@ -161,7 +161,7 @@ void EqWidget::readSettings()
setGain();
//equalizer presets
QSettings eq_preset (QDir::homePath() +"/.qmmp/eq.preset", QSettings::IniFormat);
- for (int i = 1; TRUE; ++i)
+ for (int i = 1; true; ++i)
{
if (eq_preset.contains("Presets/Preset"+QString("%1").arg(i)))
{
@@ -184,7 +184,7 @@ void EqWidget::readSettings()
}
//equalizer auto-load presets
QSettings eq_auto (QDir::homePath() +"/.qmmp/eq.auto_preset", QSettings::IniFormat);
- for (int i = 1; TRUE; ++i)
+ for (int i = 1; true; ++i)
{
if (eq_auto.contains("Presets/Preset"+QString("%1").arg(i)))
{
diff --git a/src/ui/eqwidget.h b/src/ui/eqwidget.h
index 7a48a00b8..4417cf1c0 100644
--- a/src/ui/eqwidget.h
+++ b/src/ui/eqwidget.h
@@ -53,7 +53,7 @@ public:
* necessary for auto-load presets
*/
void loadPreset(const QString &name);
- void setMimimalMode(bool b = TRUE);
+ void setMimimalMode(bool b = true);
signals:
void valueChanged();
diff --git a/src/ui/keyboardmanager.cpp b/src/ui/keyboardmanager.cpp
index 024f12bae..3e4056eab 100644
--- a/src/ui/keyboardmanager.cpp
+++ b/src/ui/keyboardmanager.cpp
@@ -34,7 +34,7 @@ KeyboardManager::KeyboardManager (PlayList* pl)
bool KeyboardManager::handleKeyPress (QKeyEvent* ke)
{
- bool handled = TRUE;
+ bool handled = true;
switch (ke->key())
{
case Qt::Key_Up:
diff --git a/src/ui/keyboardmanager.h b/src/ui/keyboardmanager.h
index 73fa1bd53..95ea57b07 100644
--- a/src/ui/keyboardmanager.h
+++ b/src/ui/keyboardmanager.h
@@ -40,13 +40,13 @@ class KeyboardManager
KeyboardManager (PlayList*);
/*!
- * Handles key press events from \b PlayList object. Returns \b TRUE
+ * Handles key press events from \b PlayList object. Returns \b true
* if the key was handled, otherwise \b FALSE.
*/
bool handleKeyPress (QKeyEvent*);
/*!
- * Handles key release events from \b PlayList object. Returns \b TRUE
+ * Handles key release events from \b PlayList object. Returns \b true
* if the key was handled, otherwise \b FALSE.
*/
bool handleKeyRelease (QKeyEvent*);
diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp
index c4d905195..5f3a20528 100644
--- a/src/ui/listwidget.cpp
+++ b/src/ui/listwidget.cpp
@@ -70,7 +70,7 @@ void ListWidget::readSettings()
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
m_font.fromString(settings.value("PlayList/Font", QApplication::font().toString()).toString());
m_show_protocol = settings.value ("PlayList/show_protocol", FALSE).toBool();
- m_show_number = settings.value ("PlayList/show_numbers", TRUE).toBool();
+ m_show_number = settings.value ("PlayList/show_numbers", true).toBool();
bool show_popup = settings.value("PlayList/show_popup", FALSE).toBool();
if (m_update)
@@ -87,7 +87,7 @@ void ListWidget::readSettings()
}
else
{
- m_update = TRUE;
+ m_update = true;
m_metrics = new QFontMetrics(m_font);
}
if(show_popup)
@@ -166,7 +166,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e)
{
if(m_popupWidget)
m_popupWidget->hide();
- m_scroll = TRUE;
+ m_scroll = true;
int y = e->y();
int row = rowAt(y);
@@ -178,7 +178,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e)
m_model->clearSelection();
if (m_model->isSelected(row) && (e->modifiers() == Qt::NoModifier))
- m_select_on_release = TRUE;
+ m_select_on_release = true;
//qWarning("m_prev_clicked_row: %d",m_prev_clicked_row);
@@ -221,7 +221,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e)
void ListWidget::resizeEvent(QResizeEvent *e)
{
m_rows = (e->size().height() - 10) / m_metrics->ascent ();
- m_scroll = TRUE;
+ m_scroll = true;
updateList();
QWidget::resizeEvent(e);
}
@@ -259,7 +259,7 @@ bool ListWidget::event (QEvent *e)
}
e->accept();
m_popupWidget->prepare(m_model->item(row), helpEvent->globalPos());
- return TRUE;
+ return true;
}
else if(e->type() == QEvent::Leave)
m_popupWidget->deactivate();
@@ -327,7 +327,7 @@ void ListWidget::scroll(int sc)
if (m_model->count() <= m_rows)
return;
m_first = sc; //*(m_model->count() - m_rows)/99;
- m_scroll = TRUE;
+ m_scroll = true;
updateList();
}
diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp
index 185107e7a..2522e6311 100644
--- a/src/ui/mainvisual.cpp
+++ b/src/ui/mainvisual.cpp
@@ -188,7 +188,7 @@ void MainVisual::mousePressEvent (QMouseEvent *e)
foreach(QAction *act, m_visModeGroup->actions ())
if (str == act->data().toString())
{
- act->setChecked(TRUE);
+ act->setChecked(true);
break;
}
}
@@ -282,13 +282,13 @@ void MainVisual::createMenu()
connect(m_menu, SIGNAL(triggered (QAction *)),SLOT(updateSettings()));
QMenu *visMode = m_menu->addMenu(tr("Visualization Mode"));
m_visModeGroup = new QActionGroup(this);
- m_visModeGroup->setExclusive(TRUE);
+ m_visModeGroup->setExclusive(true);
m_visModeGroup->addAction(tr("Analyzer"))->setData("Analyzer");
m_visModeGroup->addAction(tr("Scope"))->setData("Scope");
m_visModeGroup->addAction(tr("Off"))->setData("None");
foreach(QAction *act, m_visModeGroup->actions ())
{
- act->setCheckable(TRUE);
+ act->setCheckable(true);
visMode->addAction(act);
}
@@ -302,36 +302,36 @@ void MainVisual::createMenu()
m_analyzerTypeGroup->addAction(tr("Bars"))->setData(1);
foreach(QAction *act, m_analyzerModeGroup->actions ())
{
- act->setCheckable(TRUE);
+ act->setCheckable(true);
analyzerMode->addAction(act);
}
analyzerMode->addSeparator ();
foreach(QAction *act, m_analyzerTypeGroup->actions ())
{
- act->setCheckable(TRUE);
+ act->setCheckable(true);
analyzerMode->addAction(act);
}
analyzerMode->addSeparator ();
m_peaksAction = analyzerMode->addAction(tr("Peaks"));
- m_peaksAction->setCheckable(TRUE);
+ m_peaksAction->setCheckable(true);
QMenu *refreshRate = m_menu->addMenu(tr("Refresh Rate"));
m_fpsGroup = new QActionGroup(this);
- m_fpsGroup->setExclusive(TRUE);
+ m_fpsGroup->setExclusive(true);
m_fpsGroup->addAction(tr("50 fps"))->setData(50);
m_fpsGroup->addAction(tr("25 fps"))->setData(25);
m_fpsGroup->addAction(tr("10 fps"))->setData(10);
m_fpsGroup->addAction(tr("5 fps"))->setData(5);
foreach(QAction *act, m_fpsGroup->actions ())
{
- act->setCheckable(TRUE);
+ act->setCheckable(true);
refreshRate->addAction(act);
}
QMenu *analyzerFalloff = m_menu->addMenu(tr("Analyzer Falloff"));
m_analyzerFalloffGroup = new QActionGroup(this);
- m_analyzerFalloffGroup->setExclusive(TRUE);
+ m_analyzerFalloffGroup->setExclusive(true);
m_analyzerFalloffGroup->addAction(tr("Slowest"))->setData(1);
m_analyzerFalloffGroup->addAction(tr("Slow"))->setData(2);
m_analyzerFalloffGroup->addAction(tr("Medium"))->setData(3);
@@ -339,13 +339,13 @@ void MainVisual::createMenu()
m_analyzerFalloffGroup->addAction(tr("Fastest"))->setData(5);
foreach(QAction *act, m_analyzerFalloffGroup->actions ())
{
- act->setCheckable(TRUE);
+ act->setCheckable(true);
analyzerFalloff->addAction(act);
}
QMenu *peaksFalloff = m_menu->addMenu(tr("Peaks Falloff"));
m_peaksFalloffGroup = new QActionGroup(this);
- m_peaksFalloffGroup->setExclusive(TRUE);
+ m_peaksFalloffGroup->setExclusive(true);
m_peaksFalloffGroup->addAction(tr("Slowest"))->setData(1);
m_peaksFalloffGroup->addAction(tr("Slow"))->setData(2);
m_peaksFalloffGroup->addAction(tr("Medium"))->setData(3);
@@ -353,12 +353,12 @@ void MainVisual::createMenu()
m_peaksFalloffGroup->addAction(tr("Fastest"))->setData(5);
foreach(QAction *act, m_peaksFalloffGroup->actions ())
{
- act->setCheckable(TRUE);
+ act->setCheckable(true);
peaksFalloff->addAction(act);
}
QMenu *background = m_menu->addMenu(tr("Background"));
m_transparentAction = background->addAction(tr("Transparent"));
- m_transparentAction->setCheckable(TRUE);
+ m_transparentAction->setCheckable(true);
update();
}
@@ -368,43 +368,43 @@ void MainVisual::readSettings()
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
QString name = settings.value("Visualization/type","Analyzer").toString();
- m_visModeGroup->actions ()[0]->setChecked(TRUE);
+ m_visModeGroup->actions ()[0]->setChecked(true);
foreach(QAction *act, m_visModeGroup->actions ())
if (name == act->data().toString())
- act->setChecked(TRUE);
+ act->setChecked(true);
m_peaksAction->setChecked(
- settings.value("Visualization/show_peaks", TRUE).toBool());
+ settings.value("Visualization/show_peaks", true).toBool());
int fps = settings.value("Visualization/rate", 25).toInt();
- m_fpsGroup->actions ()[1]->setChecked(TRUE);
+ m_fpsGroup->actions ()[1]->setChecked(true);
foreach(QAction *act, m_fpsGroup->actions ())
if (fps == act->data().toInt())
- act->setChecked(TRUE);
+ act->setChecked(true);
int mode = settings.value("Visualization/analyzer_mode", 0).toInt();
- m_analyzerModeGroup->actions ()[0]->setChecked(TRUE);
+ m_analyzerModeGroup->actions ()[0]->setChecked(true);
foreach(QAction *act, m_analyzerModeGroup->actions ())
if (mode == act->data().toInt())
- act->setChecked(TRUE);
+ act->setChecked(true);
int type = settings.value("Visualization/analyzer_type", 1).toInt();
- m_analyzerTypeGroup->actions ()[1]->setChecked(TRUE);
+ m_analyzerTypeGroup->actions ()[1]->setChecked(true);
foreach(QAction *act, m_analyzerTypeGroup->actions ())
if (type == act->data().toInt())
- act->setChecked(TRUE);
+ act->setChecked(true);
int speed = settings.value("Visualization/peaks_falloff", 3).toInt();
- m_peaksFalloffGroup->actions ()[2]->setChecked(TRUE);
+ m_peaksFalloffGroup->actions ()[2]->setChecked(true);
foreach(QAction *act, m_peaksFalloffGroup->actions ())
if (speed == act->data().toInt())
- act->setChecked(TRUE);
+ act->setChecked(true);
speed = settings.value("Visualization/analyzer_falloff", 3).toInt();
- m_analyzerFalloffGroup->actions ()[2]->setChecked(TRUE);
+ m_analyzerFalloffGroup->actions ()[2]->setChecked(true);
foreach(QAction *act, m_analyzerFalloffGroup->actions ())
if (speed == act->data().toInt())
- act->setChecked(TRUE);
+ act->setChecked(true);
m_transparentAction->setChecked(
settings.value("Visualization/transparent_bg", FALSE).toBool());
@@ -429,7 +429,7 @@ Analyzer::Analyzer()
peaks_speed[settings.value("Visualization/peaks_falloff", 3).toInt()-1];
m_analyzer_falloff =
analyzer_speed[settings.value("Visualization/analyzer_falloff", 3).toInt()-1];
- m_show_peaks = settings.value("Visualization/show_peaks", TRUE).toBool();
+ m_show_peaks = settings.value("Visualization/show_peaks", true).toBool();
m_lines = settings.value("Visualization/analyzer_type", 1).toInt() == 0;
m_mode = settings.value("Visualization/analyzer_mode", 0).toInt();
@@ -514,7 +514,7 @@ bool Analyzer::process (VisualNode *node)
? magnitude : m_peaks[i];
}
}
- return TRUE;
+ return true;
}
void Analyzer::draw (QPainter *p)
@@ -605,7 +605,7 @@ bool Scope::process(VisualNode *node)
else if (m_intern_vis_data[i] < -5)
m_intern_vis_data[i] = -5;
}
- return TRUE;
+ return true;
}
void Scope::draw(QPainter *p)
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index af68a06b4..d3ef10a5f 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -301,8 +301,8 @@ void MainWindow::readSettings()
show();
qApp->processEvents();
//visibility
- m_playlist->setVisible(settings.value("Playlist/visible",TRUE).toBool());
- m_equalizer->setVisible(settings.value("Equalizer/visible",TRUE).toBool());
+ m_playlist->setVisible(settings.value("Playlist/visible",true).toBool());
+ m_equalizer->setVisible(settings.value("Equalizer/visible",true).toBool());
bool val = settings.value("Playlist/repeatable",FALSE).toBool();
// Repeat/Shuffle
@@ -312,7 +312,7 @@ void MainWindow::readSettings()
m_display->setIsShuffle(val);
m_pl_manager->setShuffle(val);
- m_update = TRUE;
+ m_update = true;
}
if(!settings.value("General/metacity_compat", FALSE).toBool())
{
@@ -401,9 +401,9 @@ void MainWindow::createActions()
QAction *repeateAllAction = m_mainMenu->addAction(tr("&Repeat Playlist"));
QAction *repeateTrackAction = m_mainMenu->addAction(tr("&Repeat Track"));
QAction *shuffleAction = m_mainMenu->addAction(tr("&Shuffle"));
- repeateAllAction->setCheckable (TRUE);
- repeateTrackAction->setCheckable (TRUE);
- shuffleAction->setCheckable (TRUE);
+ repeateAllAction->setCheckable (true);
+ repeateTrackAction->setCheckable (true);
+ shuffleAction->setCheckable (true);
repeateAllAction->setShortcut(tr("R")) ;
repeateTrackAction->setShortcut(tr("Ctrl+R")) ;
shuffleAction->setShortcut(tr("S")) ;
@@ -529,7 +529,7 @@ void MainWindow::playPause()
bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd)
{
if(slist.isEmpty())
- return TRUE;
+ return true;
QStringList paths;
foreach(QString arg, slist)
{
@@ -549,7 +549,7 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd
full_path_list << cwd + "/" + s;
}
setFileList(full_path_list);
- return TRUE;
+ return true;
}
QHash<QString, QStringList> commands = m_option_manager->splitArgs(slist);
if(commands.isEmpty())
@@ -578,7 +578,7 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd
else
return FALSE;
}
- return TRUE;
+ return true;
}
void MainWindow::jumpToFile()
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index 32892385f..1b26ab5e0 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -50,7 +50,7 @@
PlayList::PlayList (PlayListManager *manager, QWidget *parent)
: QWidget (parent)
{
- setAttribute(Qt::WA_AlwaysShowToolTips,TRUE);
+ setAttribute(Qt::WA_AlwaysShowToolTips,true);
m_pl_manager = manager;
m_update = FALSE;
m_resize = FALSE;
@@ -409,7 +409,7 @@ void PlayList::mousePressEvent (QMouseEvent *e)
m_pos = e->pos ();
if (m_resizeWidget->underMouse())
{
- m_resize = TRUE;
+ m_resize = true;
setCursor (m_skin->getCursor (Skin::CUR_PSIZE));
}
else
@@ -486,7 +486,7 @@ void PlayList::readSettings()
else
setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
move (settings.value ("PlayList/pos", QPoint (100, 332)).toPoint()); //position
- m_update = TRUE;
+ m_update = true;
}
}
diff --git a/src/ui/playlist.h b/src/ui/playlist.h
index 990af25ca..0ca76adfa 100644
--- a/src/ui/playlist.h
+++ b/src/ui/playlist.h
@@ -58,7 +58,7 @@ class PlayList : public QWidget
{
return m_listWidget;
}
- void setMinimalMode(bool b = TRUE);
+ void setMinimalMode(bool b = true);
signals:
void play();
diff --git a/src/ui/playlistbrowser.cpp b/src/ui/playlistbrowser.cpp
index 6ba36c372..bbfc921fe 100644
--- a/src/ui/playlistbrowser.cpp
+++ b/src/ui/playlistbrowser.cpp
@@ -26,7 +26,7 @@
PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QDialog(parent)
{
- setAttribute(Qt::WA_DeleteOnClose, TRUE);
+ setAttribute(Qt::WA_DeleteOnClose, true);
setAttribute(Qt::WA_QuitOnClose, FALSE);
setWindowModality(Qt::NonModal);
ui.setupUi(this);
@@ -57,7 +57,7 @@ void PlayListBrowser::updateList()
int c = m_pl_manager->indexOf(m_pl_manager->selectedPlayList());
ui.listWidget->setCurrentRow (c);
QFont font = ui.listWidget->currentItem()->font();
- font.setBold(TRUE);
+ font.setBold(true);
ui.listWidget->currentItem()->setFont(font);
}
diff --git a/src/ui/playlistselector.cpp b/src/ui/playlistselector.cpp
index 8d84750a4..1a70d8ce9 100644
--- a/src/ui/playlistselector.cpp
+++ b/src/ui/playlistselector.cpp
@@ -70,7 +70,7 @@ void PlayListSelector::readSettings()
}
else
{
- m_update = TRUE;
+ m_update = true;
}
m_metrics = new QFontMetrics(m_font);
@@ -157,7 +157,7 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e)
{
m_offset += m_rects.at(lastVisible()).right() - m_offset - width() + 42;
m_offset = qMin(m_offset, m_offset_max);
- m_right_pressed = TRUE;
+ m_right_pressed = true;
drawButtons();
update();
return;
@@ -166,7 +166,7 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e)
{
m_offset -= 11 - m_rects.at(firstVisible()).x() + m_offset;
m_offset = qMax(0, m_offset);
- m_left_pressed = TRUE;
+ m_left_pressed = true;
drawButtons();
update();
return;
diff --git a/src/ui/playlistslider.cpp b/src/ui/playlistslider.cpp
index c682906c6..4ca80406f 100644
--- a/src/ui/playlistslider.cpp
+++ b/src/ui/playlistslider.cpp
@@ -64,8 +64,8 @@ void PlayListSlider::paintEvent(QPaintEvent *)
void PlayListSlider::mousePressEvent(QMouseEvent *e)
{
- m_moving = TRUE;
- m_pressed = TRUE;
+ m_moving = true;
+ m_pressed = true;
press_pos = e->y();
if (m_pos<e->y() && e->y()<m_pos+18*m_skin->ratio())
{
diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp
index 8646f1192..55f625b36 100644
--- a/src/ui/playlisttitlebar.cpp
+++ b/src/ui/playlisttitlebar.cpp
@@ -59,7 +59,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent)
if (settings.value ("PlayList/shaded", FALSE).toBool())
shade();
resize(m_pl->width(),height());
- m_align = TRUE;
+ m_align = true;
setCursor(m_skin->getCursor(Skin::CUR_PTBAR));
updatePositions();
}
@@ -159,7 +159,7 @@ void PlayListTitleBar::mousePressEvent(QMouseEvent* event)
pos = event->pos();
if (m_shaded && (width() - 30*m_ratio) < pos.x() && pos.x() < (width() - 22*m_ratio))
{
- m_resize = TRUE;
+ m_resize = true;
setCursor (Qt::SizeHorCursor);
}
break;
diff --git a/src/ui/popupsettings.cpp b/src/ui/popupsettings.cpp
index e11f00457..837afbf3c 100644
--- a/src/ui/popupsettings.cpp
+++ b/src/ui/popupsettings.cpp
@@ -34,7 +34,7 @@ PopupSettings::PopupSettings(QWidget *parent)
ui.coverSizeSlider->setValue(settings.value ("popup_cover_size", 48).toInt());
ui.textEdit->setPlainText(settings.value ("popup_template", DEFAULT_TEMPLATE).toString());
ui.delaySpinBox->setValue(settings.value("popup_delay", 2500).toInt());
- ui.coverCheckBox->setChecked(settings.value("popup_show_cover",TRUE).toBool());
+ ui.coverCheckBox->setChecked(settings.value("popup_show_cover",true).toBool());
settings.endGroup();
createMenu();
}
diff --git a/src/ui/popupwidget.cpp b/src/ui/popupwidget.cpp
index 8531b9148..48711cbc7 100644
--- a/src/ui/popupwidget.cpp
+++ b/src/ui/popupwidget.cpp
@@ -54,18 +54,18 @@ PopupWidget::PopupWidget(QWidget *parent)
m_coverSize = settings.value("popup_cover_size", 48).toInt();
m_template = settings.value("popup_template",DEFAULT_TEMPLATE).toString();
int delay = settings.value("popup_delay", 2500).toInt();
- bool show_cover = settings.value("popup_show_cover",TRUE).toBool();
+ bool show_cover = settings.value("popup_show_cover",true).toBool();
settings.endGroup();
//timer
m_timer = new QTimer(this);
m_timer->setInterval(delay);
- m_timer->setSingleShot (TRUE);
+ m_timer->setSingleShot (true);
if(show_cover)
connect(m_timer, SIGNAL(timeout ()), SLOT(loadCover()));
else
m_pixlabel->hide();
connect(m_timer, SIGNAL(timeout ()), SLOT(show()));
- setMouseTracking(TRUE);
+ setMouseTracking(true);
}
PopupWidget::~PopupWidget()
diff --git a/src/ui/positionbar.cpp b/src/ui/positionbar.cpp
index 12396f713..c0ec42f84 100644
--- a/src/ui/positionbar.cpp
+++ b/src/ui/positionbar.cpp
@@ -50,7 +50,7 @@ PositionBar::~PositionBar()
void PositionBar::mousePressEvent(QMouseEvent *e)
{
- m_moving = TRUE;
+ m_moving = true;
press_pos = e->x();
if (m_pos<e->x() && e->x()<m_pos+29*m_skin->ratio())
{
diff --git a/src/ui/positionbar.h b/src/ui/positionbar.h
index cbabab9aa..0eb19750d 100644
--- a/src/ui/positionbar.h
+++ b/src/ui/positionbar.h
@@ -59,7 +59,7 @@ private:
QPixmap m_pixmap;
MainWindow *mw;
qint64 convert(qint64); // value = convert(position);
- void draw(bool pressed = TRUE);
+ void draw(bool pressed = true);
protected:
void mousePressEvent(QMouseEvent*);
diff --git a/src/ui/shadedbar.cpp b/src/ui/shadedbar.cpp
index dec2b79fd..b524acd10 100644
--- a/src/ui/shadedbar.cpp
+++ b/src/ui/shadedbar.cpp
@@ -52,7 +52,7 @@ ShadedBar::~ShadedBar()
void ShadedBar::mousePressEvent(QMouseEvent *e)
{
- m_moving = TRUE;
+ m_moving = true;
press_pos = e->x();
if(m_pos<e->x() && e->x()<m_pos+3)
{
diff --git a/src/ui/skinreader.cpp b/src/ui/skinreader.cpp
index 789fff0b9..69b976636 100644
--- a/src/ui/skinreader.cpp
+++ b/src/ui/skinreader.cpp
@@ -59,7 +59,7 @@ void SkinReader::generateThumbs()
//clear removed skins from cache
foreach(QFileInfo thumbFile, d)
{
- bool del = TRUE;
+ bool del = true;
foreach(QFileInfo fileInfo, f)
{
if (fileInfo.baseName () == thumbFile.baseName ())
@@ -79,7 +79,7 @@ void SkinReader::generateThumbs()
//add new skins to cache
foreach(QFileInfo fileInfo, f)
{
- bool create = TRUE;
+ bool create = true;
foreach(QFileInfo thumbInfo, d)
{
if (fileInfo.baseName () == thumbInfo.baseName ())
@@ -95,9 +95,9 @@ void SkinReader::generateThumbs()
QString name = fileInfo.fileName ().toLower();
if (name.endsWith(".tgz") || name.endsWith(".tar.gz") || name.endsWith(".tar.bz2"))
- untar(fileInfo.filePath (), cache_dir.absolutePath (), TRUE);
+ untar(fileInfo.filePath (), cache_dir.absolutePath (), true);
if (name.endsWith(".zip") || name.endsWith(".wsz"))
- unzip(fileInfo.filePath (), cache_dir.absolutePath (), TRUE);
+ unzip(fileInfo.filePath (), cache_dir.absolutePath (), true);
}
}
//add thumbs to map
diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp
index 266ddc3a9..5328d574b 100644
--- a/src/ui/textscroller.cpp
+++ b/src/ui/textscroller.cpp
@@ -59,14 +59,14 @@ TextScroller::TextScroller ( QWidget *parent )
m_timer->start();
updateSkin();
connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
- m_autoscroll = TRUE;
+ m_autoscroll = true;
m_menu = new QMenu(this);
QAction *autoscrollAction = new QAction(tr("Autoscroll Songname"), m_menu);
- autoscrollAction->setCheckable (TRUE);
+ autoscrollAction->setCheckable (true);
connect(autoscrollAction, SIGNAL(toggled(bool)), SLOT(setAutoscroll(bool)));
m_menu->addAction(autoscrollAction);
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
- autoscrollAction->setChecked(settings.value("TextScroller/autoscroll", TRUE).toBool());
+ autoscrollAction->setChecked(settings.value("TextScroller/autoscroll", true).toBool());
setAutoscroll(autoscrollAction->isChecked());
}
@@ -151,7 +151,7 @@ void TextScroller::readSettings()
}
else
{
- m_update = TRUE;
+ m_update = true;
m_bitmap = FALSE;
}
@@ -236,7 +236,7 @@ void TextScroller::mousePressEvent (QMouseEvent *e)
{
m_timer->stop();
press_pos = e->x() - (x + 154);
- m_pressing = TRUE;
+ m_pressing = true;
}
else
QWidget::mousePressEvent(e);
diff --git a/src/ui/timeindicator.cpp b/src/ui/timeindicator.cpp
index 679edad10..200168c3d 100644
--- a/src/ui/timeindicator.cpp
+++ b/src/ui/timeindicator.cpp
@@ -40,7 +40,7 @@ TimeIndicator::TimeIndicator (QWidget *parent)
connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
m_timer = new QTimer(this);
m_timer->setInterval(125);
- m_timer->setSingleShot (TRUE);
+ m_timer->setSingleShot (true);
connect(m_timer, SIGNAL(timeout()),SLOT(reset()));
}
diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp
index 7f438dcd0..02b9d41ac 100644
--- a/src/ui/titlebar.cpp
+++ b/src/ui/titlebar.cpp
@@ -61,7 +61,7 @@ TitleBar::TitleBar(QWidget *parent)
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
if (settings.value("Display/shaded", FALSE).toBool())
shade();
- m_align = TRUE;
+ m_align = true;
setCursor(m_skin->getCursor(Skin::CUR_TITLEBAR));
updatePositions();
}
diff --git a/src/ui/titlebarcontrol.cpp b/src/ui/titlebarcontrol.cpp
index 8f339602b..d4f064c75 100644
--- a/src/ui/titlebarcontrol.cpp
+++ b/src/ui/titlebarcontrol.cpp
@@ -24,7 +24,7 @@
TitleBarControl::TitleBarControl(QWidget *parent) : QWidget(parent)
{
- //setAutoFillBackground(TRUE);
+ //setAutoFillBackground(true);
m_ratio = Skin::instance()->ratio();
resize(m_ratio*57, m_ratio*10);
connect(Skin::instance(), SIGNAL(skinChanged()),SLOT(updateSkin()));
diff --git a/src/ui/togglebutton.cpp b/src/ui/togglebutton.cpp
index 020ef7c8b..5994134ec 100644
--- a/src/ui/togglebutton.cpp
+++ b/src/ui/togglebutton.cpp
@@ -70,7 +70,7 @@ void ToggleButton::setON ( bool on )
}
void ToggleButton::mousePressEvent ( QMouseEvent* )
{
- m_cursorin = TRUE;
+ m_cursorin = true;
m_old_on = m_on;
if ( m_on )
setPixmap ( skin->getButton ( m_off_p ) );
@@ -93,7 +93,7 @@ void ToggleButton::mouseReleaseEvent ( QMouseEvent* )
void ToggleButton::mouseMoveEvent (QMouseEvent *e)
{
if ( !m_cursorin && rect().contains(e->pos()) ) {
- m_cursorin = TRUE;
+ m_cursorin = true;
if ( m_old_on )
setPixmap ( skin->getButton ( m_off_p ) );
else
diff --git a/src/ui/visualmenu.cpp b/src/ui/visualmenu.cpp
index 6e5ff2d90..af8e936d2 100644
--- a/src/ui/visualmenu.cpp
+++ b/src/ui/visualmenu.cpp
@@ -51,7 +51,7 @@ void VisualMenu::updateActions()
VisualAction::VisualAction(VisualFactory *factory, QWidget *parent) :
QAction(factory->properties().name, parent)
{
- setCheckable (TRUE);
+ setCheckable (true);
setChecked (Visual::isEnabled(factory));
m_factory = factory;
connect(this, SIGNAL(triggered(bool)), SLOT(select(bool)));
diff --git a/src/ui/volumebar.cpp b/src/ui/volumebar.cpp
index ae010e4f2..b0c656d4e 100644
--- a/src/ui/volumebar.cpp
+++ b/src/ui/volumebar.cpp
@@ -48,7 +48,7 @@ VolumeBar::~VolumeBar()
void VolumeBar::mousePressEvent(QMouseEvent *e)
{
- m_moving = TRUE;
+ m_moving = true;
press_pos = e->x();
if(m_pos<e->x() && e->x()<m_pos+11*m_skin->ratio())
{
diff --git a/src/ui/volumebar.h b/src/ui/volumebar.h
index 21b577cf3..44ff6ac17 100644
--- a/src/ui/volumebar.h
+++ b/src/ui/volumebar.h
@@ -63,7 +63,7 @@ private:
QPixmap m_pixmap;
MainWindow *mw;
int convert(int); // value = convert(position);
- void draw(bool pressed = TRUE);
+ void draw(bool pressed = true);
protected:
void mousePressEvent(QMouseEvent*);