diff options
Diffstat (limited to 'src/ui')
32 files changed, 152 insertions, 152 deletions
diff --git a/src/ui/aboutdialog.cpp b/src/ui/aboutdialog.cpp index f9a407f07..5728697b9 100644 --- a/src/ui/aboutdialog.cpp +++ b/src/ui/aboutdialog.cpp @@ -55,7 +55,7 @@ AboutDialog::AboutDialog(QWidget* parent, Qt::WFlags fl) : QDialog( parent, fl ) { setupUi(this); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); licenseTextEdit->setPlainText(getstringFromResource(":COPYING")); aboutTextEdit->setHtml(loadAbout()); authorsTextEdit->setPlainText(getstringFromResource(tr(":/txt/authors_en.txt"))); diff --git a/src/ui/addurldialog.cpp b/src/ui/addurldialog.cpp index 92db9ab39..eb14071aa 100644 --- a/src/ui/addurldialog.cpp +++ b/src/ui/addurldialog.cpp @@ -39,7 +39,7 @@ AddUrlDialog::AddUrlDialog( QWidget * parent, Qt::WindowFlags f) : QDialog(paren { setupUi(this); setAttribute(Qt::WA_DeleteOnClose); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_history = settings.value("URLDialog/history").toStringList(); urlComboBox->addItems(m_history); @@ -100,7 +100,7 @@ void AddUrlDialog::accept( ) request.setUrl(QUrl(s)); request.setRawHeader("User-Agent", QString("qmmp/%1").arg(Qmmp::strVersion()).toAscii()); m_http->get(request); - addButton->setEnabled(FALSE); + addButton->setEnabled(false); return; } } diff --git a/src/ui/balancebar.cpp b/src/ui/balancebar.cpp index 2984577aa..6b4774a2e 100644 --- a/src/ui/balancebar.cpp +++ b/src/ui/balancebar.cpp @@ -32,11 +32,11 @@ BalanceBar::BalanceBar(QWidget *parent) m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getBalanceBar(0)); - m_moving = FALSE; + m_moving = false; m_min = -100; m_max = 100; m_old = m_value = 0; - draw(FALSE); + draw(false); } @@ -82,8 +82,8 @@ void BalanceBar::mouseMoveEvent (QMouseEvent *e) void BalanceBar::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; - draw(FALSE); + m_moving = false; + draw(false); m_old = m_value; } @@ -92,19 +92,19 @@ void BalanceBar::setValue(int v) if (m_moving || m_max == 0) return; m_value = v; - draw(FALSE); + draw(false); } void BalanceBar::setMax(int max) { m_max = max; - draw(FALSE); + draw(false); } void BalanceBar::updateSkin() { resize(m_skin->getBalanceBar(0).size()); - draw(FALSE); + draw(false); } void BalanceBar::draw(bool pressed) diff --git a/src/ui/builtincommandlineoption.cpp b/src/ui/builtincommandlineoption.cpp index 3a51d7190..25dee45e1 100644 --- a/src/ui/builtincommandlineoption.cpp +++ b/src/ui/builtincommandlineoption.cpp @@ -48,7 +48,7 @@ bool BuiltinCommandLineOption::identify(const QString & str) const str == "--add-file" || str == "--add-dir") return true; - return FALSE; + return false; } const QString BuiltinCommandLineOption::helpString() const @@ -117,7 +117,7 @@ void BuiltinCommandLineOption::executeCommand(const QString &option_string, } else if (option_string == "--volume" && !args.isEmpty()) { - bool ok = FALSE; + bool ok = false; int volume = args.at(0).toInt(&ok); if (ok) mw->soundCore()->setVolume(volume,volume); diff --git a/src/ui/button.cpp b/src/ui/button.cpp index 18279b0e0..9b96f8f52 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -32,7 +32,7 @@ Button::Button (QWidget *parent, uint normal, uint pressed, uint cursor) name_pressed = pressed; name_cursor = cursor; skin = Skin::instance(); - setON (FALSE); + setON (false); setCursor (skin->getCursor (name_cursor)); connect (skin, SIGNAL (skinChanged()), this, SLOT (updateSkin())); } @@ -63,7 +63,7 @@ void Button::mousePressEvent (QMouseEvent *e) void Button::mouseReleaseEvent (QMouseEvent*) { - setON (FALSE); + setON (false); if (m_cursorin) emit clicked(); } @@ -74,7 +74,7 @@ void Button::mouseMoveEvent (QMouseEvent *e) m_cursorin = true; setON (true); } else if ( m_cursorin && !rect().contains(e->pos()) ) { - m_cursorin = FALSE; - setON (FALSE); + m_cursorin = false; + setON (false); } } diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 061245957..16858a0fb 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -55,10 +55,10 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent) { ui.setupUi (this); - setAttribute(Qt::WA_QuitOnClose, FALSE); - setAttribute(Qt::WA_DeleteOnClose, FALSE); - ui.preferencesButton->setEnabled(FALSE); - ui.informationButton->setEnabled(FALSE); + setAttribute(Qt::WA_QuitOnClose, false); + setAttribute(Qt::WA_DeleteOnClose, false); + ui.preferencesButton->setEnabled(false); + ui.informationButton->setEnabled(false); connect (ui.mainFontButton, SIGNAL (clicked()), SLOT (setMainFont())); connect (ui.plFontButton, SIGNAL (clicked()), SLOT (setPlFont())); connect (this, SIGNAL(rejected()),SLOT(saveSettings())); @@ -92,10 +92,10 @@ void ConfigDialog::readSettings() ui.underscoresCheckBox->setChecked(player->playListManager()->convertUnderscore()); ui.per20CheckBox->setChecked(player->playListManager()->convertTwenty()); } - ui.protocolCheckBox->setChecked(settings.value ("PlayList/show_protocol", FALSE).toBool()); + ui.protocolCheckBox->setChecked(settings.value ("PlayList/show_protocol", false).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()); + ui.playlistsCheckBox->setChecked(settings.value("PlayList/show_plalists", false).toBool()); + ui.popupCheckBox->setChecked(settings.value("PlayList/show_popup", false).toBool()); QmmpSettings *gs = QmmpSettings::instance(); //proxy settings ui.enableProxyCheckBox->setChecked(gs->isProxyEnabled()); @@ -111,23 +111,23 @@ void ConfigDialog::readSettings() ui.proxyUserLineEdit->setEnabled(ui.authProxyCheckBox->isChecked()); ui.proxyPasswLineEdit->setEnabled(ui.authProxyCheckBox->isChecked()); - ui.hiddenCheckBox->setChecked(settings.value("MainWindow/start_hidden", FALSE).toBool()); - ui.hideOnCloseCheckBox->setChecked(settings.value("MainWindow/hide_on_close", FALSE).toBool()); + ui.hiddenCheckBox->setChecked(settings.value("MainWindow/start_hidden", false).toBool()); + ui.hideOnCloseCheckBox->setChecked(settings.value("MainWindow/hide_on_close", false).toBool()); //transparency ui.mwTransparencySlider->setValue(100 - settings.value("MainWindow/opacity", 1.0).toDouble()*100); ui.eqTransparencySlider->setValue(100 - settings.value("Equalizer/opacity", 1.0).toDouble()*100); ui.plTransparencySlider->setValue(100 - settings.value("PlayList/opacity", 1.0).toDouble()*100); //compatibility - ui.openboxCheckBox->setChecked(settings.value("General/openbox_compat", FALSE).toBool()); - ui.metacityCheckBox->setChecked(settings.value("General/metacity_compat", FALSE).toBool()); + ui.openboxCheckBox->setChecked(settings.value("General/openbox_compat", false).toBool()); + ui.metacityCheckBox->setChecked(settings.value("General/metacity_compat", false).toBool()); //skin options - ui.skinCursorsCheckBox->setChecked(settings.value("General/skin_cursors", FALSE).toBool()); - ui.doubleSizeCheckBox->setChecked(settings.value("General/double_size", FALSE).toBool()); + ui.skinCursorsCheckBox->setChecked(settings.value("General/skin_cursors", false).toBool()); + ui.doubleSizeCheckBox->setChecked(settings.value("General/double_size", false).toBool()); //resume playback - ui.continuePlaybackCheckBox->setChecked(settings.value("General/resume_on_startup", FALSE).toBool()); + ui.continuePlaybackCheckBox->setChecked(settings.value("General/resume_on_startup", false).toBool()); //cover options ui.coverIncludeLineEdit->setText(gs->coverNameFilters(true).join(",")); - ui.coverExcludeLineEdit->setText(gs->coverNameFilters(FALSE).join(",")); + ui.coverExcludeLineEdit->setText(gs->coverNameFilters(false).join(",")); ui.coverDepthSpinBox->setValue(gs->coverSearchDepth()); ui.useCoverFilesCheckBox->setChecked(gs->useCoverFiles()); //replay gain @@ -279,14 +279,14 @@ void ConfigDialog::loadPluginsInfo() ui.treeWidget->addTopLevelItem(item); item->setExpanded(true); - ui.treeWidget->blockSignals(FALSE); + ui.treeWidget->blockSignals(false); ui.treeWidget->resizeColumnToContents(0); ui.treeWidget->resizeColumnToContents(1); /* load output plugins information */ - ui.outputInformationButton->setEnabled(FALSE); - ui.outputPreferencesButton->setEnabled(FALSE); + ui.outputInformationButton->setEnabled(false); + ui.outputPreferencesButton->setEnabled(false); QList <OutputFactory *> *outputs = Output::factories(); for (int i = 0; i < outputs->count (); ++i) { @@ -324,7 +324,7 @@ void ConfigDialog::loadFonts() font.fromString(fontname); ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.mainFontLabel->setFont(font); - ui.useBitmapCheckBox->setChecked(settings.value("MainWindow/bitmap_font", FALSE).toBool()); + ui.useBitmapCheckBox->setChecked(settings.value("MainWindow/bitmap_font", false).toBool()); } void ConfigDialog::setPlFont() @@ -499,8 +499,8 @@ void ConfigDialog::on_treeWidget_currentItemChanged (QTreeWidgetItem *current, Q } else { - ui.preferencesButton->setEnabled(FALSE); - ui.informationButton->setEnabled(FALSE); + ui.preferencesButton->setEnabled(false); + ui.informationButton->setEnabled(false); } } diff --git a/src/ui/cursorimage.cpp b/src/ui/cursorimage.cpp index 2dbe1353b..30fcf0173 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 82a0edc89..641857a38 100644 --- a/src/ui/display.cpp +++ b/src/ui/display.cpp @@ -44,7 +44,7 @@ MainDisplay::MainDisplay (QWidget *parent) : PixmapWidget (parent) { - m_shaded = FALSE; + m_shaded = false; m_skin = Skin::instance(); setPixmap (m_skin->getMain()); setCursor(m_skin->getCursor(Skin::CUR_NORMAL)); @@ -181,7 +181,7 @@ void MainDisplay::setState(Qmmp::State state) case Qmmp::Stopped: m_playstatus->setStatus(PlayStatus::STOP); m_monoster->setChannels (0); - m_timeIndicator->setNeedToShowTime(FALSE); + m_timeIndicator->setNeedToShowTime(false); m_posbar->setValue (0); m_posbar->setMax (0); m_titlebar->setTime(-1); diff --git a/src/ui/dock.cpp b/src/ui/dock.cpp index d5d373e86..ee6658331 100644 --- a/src/ui/dock.cpp +++ b/src/ui/dock.cpp @@ -50,7 +50,7 @@ void Dock::setMainWidget (QWidget *widget) { m_mainWidget = widget; m_widgetList.prepend (widget); - m_dockedList.prepend (FALSE); + m_dockedList.prepend (false); } @@ -109,7 +109,7 @@ QPoint Dock::snap (QPoint npos, QWidget* mv, QWidget* st) void Dock::addWidget (QWidget *widget) { m_widgetList.append (widget); - m_dockedList.append (FALSE); + m_dockedList.append (false); widget->addActions(m_actions); } @@ -157,7 +157,7 @@ void Dock::move (QWidget* mv, QPoint npos) { for (int i = 0; i<m_widgetList.size(); ++i) { - m_dockedList[i] = FALSE; + m_dockedList[i] = false; if (mv != m_widgetList.at (i) && !m_dockedList.at (i) && m_widgetList.at (i)->isVisible()) { npos = snap (npos, mv, m_widgetList.at (i)); @@ -234,7 +234,7 @@ bool Dock::isDocked (QWidget* mv, QWidget* st) ny = mv->y() - st->y(); if (nx < 2 && ny > -mv->height() && ny < st->height()) //right return true; - return FALSE; + return false; } void Dock::addActions (QList<QAction *> actions) diff --git a/src/ui/eqslider.cpp b/src/ui/eqslider.cpp index 1ddf7699b..8779bb6ac 100644 --- a/src/ui/eqslider.cpp +++ b/src/ui/eqslider.cpp @@ -32,11 +32,11 @@ EqSlider::EqSlider(QWidget *parent): PixmapWidget(parent) m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getEqSlider(0)); - m_moving = FALSE; + m_moving = false; m_min = -20; m_max = 20; m_old = m_value = 0; - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_EQSLID)); } @@ -66,8 +66,8 @@ void EqSlider::mousePressEvent(QMouseEvent *e) void EqSlider::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; - draw(FALSE); + m_moving = false; + draw(false); } void EqSlider::mouseMoveEvent(QMouseEvent* e) @@ -102,19 +102,19 @@ void EqSlider::setValue(double p) if (m_moving) return; m_value = -p; - draw(FALSE); + draw(false); } void EqSlider::setMax(double m) { m_max = m; - draw(FALSE); + draw(false); } void EqSlider::updateSkin() { resize(m_skin->getEqSlider(0).size()); - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_EQSLID)); } @@ -141,7 +141,7 @@ void EqSlider::wheelEvent(QWheelEvent *e) m_value -= e->delta()/60; m_value = m_value > m_max ? m_max : m_value; m_value = m_value < m_min ? m_min : m_value; - draw(FALSE); + draw(false); emit sliderMoved(m_value); } diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp index 97d2626cb..b46ec1720 100644 --- a/src/ui/eqtitlebar.cpp +++ b/src/ui/eqtitlebar.cpp @@ -36,8 +36,8 @@ EqTitleBar::EqTitleBar(QWidget *parent) m_shade2 = 0; m_left = 0; m_right = 0; - m_shaded = FALSE; - m_align = FALSE; + m_shaded = false; + m_align = false; m_skin = Skin::instance(); m_eq = parentWidget(); m_mw = qobject_cast<MainWindow*>(m_eq->parent()); @@ -46,10 +46,10 @@ EqTitleBar::EqTitleBar(QWidget *parent) m_shade = new Button(this, Skin::EQ_BT_SHADE1_N, Skin::EQ_BT_SHADE1_P, Skin::CUR_EQNORMAL); connect(m_shade, SIGNAL(clicked()), SLOT(shade())); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("Equalizer/shaded", FALSE).toBool()) + if (settings.value("Equalizer/shaded", false).toBool()) shade(); m_align = true; - setActive(FALSE); + setActive(false); setCursor(m_skin->getCursor(Skin::CUR_EQTITLE)); connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin())); updatePositions(); diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp index d84de2c37..68e9307a2 100644 --- a/src/ui/eqwidget.cpp +++ b/src/ui/eqwidget.cpp @@ -39,7 +39,7 @@ EqWidget::EqWidget (QWidget *parent) : PixmapWidget (parent) { - m_shaded = FALSE; + m_shaded = false; m_skin = Skin::instance(); setPixmap (m_skin->getEqPart (Skin::EQ_MAIN)); setCursor (m_skin->getCursor (Skin::CUR_EQNORMAL)); @@ -120,7 +120,7 @@ void EqWidget::closeEvent (QCloseEvent* e) void EqWidget::updateSkin() { - m_titleBar->setActive (FALSE); + m_titleBar->setActive (false); setPixmap (m_skin->getEqPart (Skin::EQ_MAIN)); setCursor (m_skin->getCursor (Skin::CUR_EQNORMAL)); setMimimalMode(m_shaded); @@ -142,8 +142,8 @@ void EqWidget::setMimimalMode(bool b) void EqWidget::readSettings() { QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("General/openbox_compat", FALSE).toBool() || - settings.value("General/metacity_compat", FALSE).toBool()) + if (settings.value("General/openbox_compat", false).toBool() || + settings.value("General/metacity_compat", false).toBool()) setWindowFlags (Qt::Tool | Qt::FramelessWindowHint); else setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); @@ -156,7 +156,7 @@ void EqWidget::readSettings() m_sliders.at(i)->setValue(settings.value("band_"+ QString("%1").arg(i), 0).toDouble()); m_preamp->setValue(settings.value("preamp", 0).toDouble()); - m_on->setON(settings.value("enabled", FALSE).toBool()); + m_on->setON(settings.value("enabled", false).toBool()); settings.endGroup(); setGain(); //equalizer presets diff --git a/src/ui/jumptotrackdialog.cpp b/src/ui/jumptotrackdialog.cpp index 815740bcd..5c98a6042 100644 --- a/src/ui/jumptotrackdialog.cpp +++ b/src/ui/jumptotrackdialog.cpp @@ -30,7 +30,7 @@ JumpToTrackDialog::JumpToTrackDialog(PlayListManager *manager, QWidget* parent) : QDialog (parent) { setupUi(this); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); m_pl_manager = manager; m_listModel = new QStringListModel(this); diff --git a/src/ui/keyboardmanager.cpp b/src/ui/keyboardmanager.cpp index 3e4056eab..cbdc70c33 100644 --- a/src/ui/keyboardmanager.cpp +++ b/src/ui/keyboardmanager.cpp @@ -60,14 +60,14 @@ bool KeyboardManager::handleKeyPress (QKeyEvent* ke) keyEnd(ke); break; default: - handled = FALSE; + handled = false; } return handled; } bool KeyboardManager::handleKeyRelease (QKeyEvent*) { - return FALSE; + return false; } void KeyboardManager::keyUp (QKeyEvent * ke) diff --git a/src/ui/keyboardmanager.h b/src/ui/keyboardmanager.h index 95ea57b07..120dbe9dc 100644 --- a/src/ui/keyboardmanager.h +++ b/src/ui/keyboardmanager.h @@ -41,13 +41,13 @@ class KeyboardManager /*! * Handles key press events from \b PlayList object. Returns \b true - * if the key was handled, otherwise \b FALSE. + * if the key was handled, otherwise \b false. */ bool handleKeyPress (QKeyEvent*); /*! * Handles key release events from \b PlayList object. Returns \b true - * if the key was handled, otherwise \b FALSE. + * if the key was handled, otherwise \b false. */ bool handleKeyRelease (QKeyEvent*); diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp index 5f3a20528..2b17935e2 100644 --- a/src/ui/listwidget.cpp +++ b/src/ui/listwidget.cpp @@ -41,7 +41,7 @@ ListWidget::ListWidget(QWidget *parent) : QWidget(parent) { - m_update = FALSE; + m_update = false; m_skin = Skin::instance(); m_popupWidget = 0; loadColors(); @@ -53,8 +53,8 @@ ListWidget::ListWidget(QWidget *parent) connect (m_player, SIGNAL(repeatableChanged(bool)), SLOT(updateList())); m_first = 0; m_rows = 0; - m_scroll = FALSE; - m_select_on_release = FALSE; + m_scroll = false; + m_select_on_release = false; readSettings(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setAcceptDrops(true); @@ -69,9 +69,9 @@ 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_protocol = settings.value ("PlayList/show_protocol", false).toBool(); m_show_number = settings.value ("PlayList/show_numbers", true).toBool(); - bool show_popup = settings.value("PlayList/show_popup", FALSE).toBool(); + bool show_popup = settings.value("PlayList/show_popup", false).toBool(); if (m_update) { @@ -240,7 +240,7 @@ void ListWidget::wheelEvent (QWheelEvent *e) if (m_first > m_model->count() - m_rows) m_first = m_model->count() - m_rows; - m_scroll = FALSE; + m_scroll = false; updateList(); } @@ -288,7 +288,7 @@ void ListWidget::updateList() m_titles = m_model->getTitles(m_first, m_rows); m_times = m_model->getTimes(m_first, m_rows); - m_scroll = FALSE; + m_scroll = false; //add numbers for (int i = 0; i < m_titles.size() && m_show_number; ++i) { @@ -315,7 +315,7 @@ void ListWidget::setModel(PlayListModel *selected, PlayListModel *previous) qApp->processEvents(); m_model = selected; m_first = 0; - m_scroll = FALSE; + m_scroll = false; recenterCurrent(); updateList(); connect (m_model, SIGNAL(currentChanged()), SLOT(recenterCurrent())); @@ -436,13 +436,13 @@ void ListWidget::mouseMoveEvent(QMouseEvent *e) void ListWidget::mouseReleaseEvent(QMouseEvent *e) { - if (FALSE != m_select_on_release) + if (false != m_select_on_release) { m_model->clearSelection(); m_model->setSelected(m_pressed_row,true); //if(e->modifiers() != Qt::ShiftModifier) m_anchor_row = m_pressed_row; - m_select_on_release = FALSE; + m_select_on_release = false; } m_pressed_row = INVALID_ROW; m_scroll_direction = NONE; diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp index 2522e6311..c2493267d 100644 --- a/src/ui/mainvisual.cpp +++ b/src/ui/mainvisual.cpp @@ -42,7 +42,7 @@ MainVisual *MainVisual::instance() } MainVisual::MainVisual (QWidget *parent) - : Visual (parent), m_vis (0), m_playing (FALSE) + : Visual (parent), m_vis (0), m_playing (false) { m_skin = Skin::instance(); m_ratio = m_skin->ratio(); @@ -407,7 +407,7 @@ void MainVisual::readSettings() act->setChecked(true); m_transparentAction->setChecked( - settings.value("Visualization/transparent_bg", FALSE).toBool()); + settings.value("Visualization/transparent_bg", false).toBool()); updateSettings(); } @@ -475,7 +475,7 @@ bool Analyzer::process (VisualNode *node) calc_freq (dest, node->left); } else - return FALSE; + return false; const double y_scale = 3.60673760222; /* 20.0 / log(256) */ int max = m_lines ? 75 : 19, y, j; @@ -590,7 +590,7 @@ Scope::~Scope() bool Scope::process(VisualNode *node) { if (!node) - return FALSE; + return false; int step = (node->length << 8)/76; int pos = 0; diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index d3ef10a5f..be6f709c7 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -56,7 +56,7 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option : QMainWindow(parent) { m_vis = 0; - m_update = FALSE; + m_update = false; m_option_manager = option_manager; setWindowIcon(QIcon(":/32x32/qmmp.png")); #if QT_VERSION >= 0x040500 @@ -296,31 +296,31 @@ void MainWindow::readSettings() move(settings.value("pos", QPoint(100, 100)).toPoint()); //last directory m_lastDir = settings.value("last_dir","/").toString(); - m_startHidden = settings.value("start_hidden", FALSE).toBool(); + m_startHidden = settings.value("start_hidden", false).toBool(); settings.endGroup(); show(); qApp->processEvents(); //visibility 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(); + bool val = settings.value("Playlist/repeatable",false).toBool(); // Repeat/Shuffle m_pl_manager->setRepeatableList(val); m_display->setIsRepeatable(val); - val = settings.value("Playlist/shuffle",FALSE).toBool(); + val = settings.value("Playlist/shuffle",false).toBool(); m_display->setIsShuffle(val); m_pl_manager->setShuffle(val); m_update = true; } - if(!settings.value("General/metacity_compat", FALSE).toBool()) + if(!settings.value("General/metacity_compat", false).toBool()) { setWindowOpacity(settings.value("MainWindow/opacity", 1.0).toDouble()); m_equalizer->setWindowOpacity(settings.value("Equalizer/opacity", 1.0).toDouble()); m_playlist->setWindowOpacity(settings.value("PlayList/opacity", 1.0).toDouble()); } - m_hideOnClose = settings.value("MainWindow/hide_on_close", FALSE).toBool(); + m_hideOnClose = settings.value("MainWindow/hide_on_close", false).toBool(); } void MainWindow::writeSettings() @@ -340,7 +340,7 @@ void MainWindow::writeSettings() // playback state settings.beginGroup("General"); settings.setValue("resume_playback", m_core->state() == Qmmp::Playing && - settings.value("resume_on_startup", FALSE).toBool()); + settings.value("resume_on_startup", false).toBool()); settings.setValue("resume_playback_time", m_core->totalTime() > 0 ? m_core->elapsed() : 0); settings.endGroup(); } @@ -553,14 +553,14 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd } QHash<QString, QStringList> commands = m_option_manager->splitArgs(slist); if(commands.isEmpty()) - return FALSE; + return false; foreach(QString key, commands.keys()) { if(key == "--enqueue" || key == "-e") { QStringList args = commands.value(key); if(args.isEmpty()) - return FALSE; + return false; QStringList full_path_list; foreach(QString s, args) { @@ -576,7 +576,7 @@ bool MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd else if (m_option_manager->identify(key)) m_option_manager->executeCommand(key, commands.value(key), this); else - return FALSE; + return false; } return true; } @@ -624,7 +624,7 @@ void MainWindow::resume() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("General"); - if(settings.value("resume_playback", FALSE).toBool()) + if(settings.value("resume_playback", false).toBool()) { qint64 pos = settings.value("resume_playback_time").toLongLong(); m_player->play(pos); diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index 1b26ab5e0..87047731f 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -52,11 +52,11 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent) { setAttribute(Qt::WA_AlwaysShowToolTips,true); m_pl_manager = manager; - m_update = FALSE; - m_resize = FALSE; + m_update = false; + m_resize = false; m_skin = Skin::instance(); m_ratio = m_skin->ratio(); - m_shaded = FALSE; + m_shaded = false; m_pl_browser = 0; m_pl_selector = 0; @@ -413,7 +413,7 @@ void PlayList::mousePressEvent (QMouseEvent *e) setCursor (m_skin->getCursor (Skin::CUR_PSIZE)); } else - m_resize = FALSE; + m_resize = false; } void PlayList::mouseMoveEvent (QMouseEvent *e) @@ -443,7 +443,7 @@ void PlayList::mouseReleaseEvent (QMouseEvent *) setCursor (m_skin->getCursor (Skin::CUR_PNORMAL)); /*if (m_resize) m_listWidget->updateList();*/ - m_resize = FALSE; + m_resize = false; Dock::instance()->updateDock(); } @@ -458,7 +458,7 @@ void PlayList::changeEvent (QEvent * event) void PlayList::readSettings() { QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("PlayList/show_plalists", FALSE).toBool()) + if (settings.value("PlayList/show_plalists", false).toBool()) { if(!m_pl_selector) m_pl_selector = new PlayListSelector(m_pl_manager, this); @@ -480,8 +480,8 @@ void PlayList::readSettings() } else { - if (settings.value("General/openbox_compat", FALSE).toBool() || - settings.value("General/metacity_compat", FALSE).toBool()) + if (settings.value("General/openbox_compat", false).toBool() || + settings.value("General/metacity_compat", false).toBool()) setWindowFlags (Qt::Tool | Qt::FramelessWindowHint); else setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); diff --git a/src/ui/playlistbrowser.cpp b/src/ui/playlistbrowser.cpp index bbfc921fe..7f4a52167 100644 --- a/src/ui/playlistbrowser.cpp +++ b/src/ui/playlistbrowser.cpp @@ -27,7 +27,7 @@ PlayListBrowser::PlayListBrowser(PlayListManager *manager, QWidget *parent) : QDialog(parent) { setAttribute(Qt::WA_DeleteOnClose, true); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); setWindowModality(Qt::NonModal); ui.setupUi(this); m_pl_manager = manager; diff --git a/src/ui/playlistselector.cpp b/src/ui/playlistselector.cpp index 1a70d8ce9..22cc967ce 100644 --- a/src/ui/playlistselector.cpp +++ b/src/ui/playlistselector.cpp @@ -34,10 +34,10 @@ PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) : QWidget(parent) { - m_update = FALSE; - m_scrollable = FALSE; - m_left_pressed = FALSE; - m_right_pressed = FALSE; + m_update = false; + m_scrollable = false; + m_left_pressed = false; + m_right_pressed = false; m_offset = 0; m_offset_max = 0; m_skin = Skin::instance(); @@ -106,7 +106,7 @@ void PlayListSelector::updateSkin() void PlayListSelector::renamePlaylist() { - bool ok = FALSE; + bool ok = false; QString name = QInputDialog::getText (this, tr("Rename Playlist"), tr("Playlist name:"), QLineEdit::Normal, @@ -189,8 +189,8 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e) void PlayListSelector::mouseReleaseEvent (QMouseEvent *e) { - m_left_pressed = FALSE; - m_right_pressed = FALSE; + m_left_pressed = false; + m_right_pressed = false; drawButtons(); update(); QWidget::mouseReleaseEvent(e); diff --git a/src/ui/playlistslider.cpp b/src/ui/playlistslider.cpp index 4ca80406f..df958fa6b 100644 --- a/src/ui/playlistslider.cpp +++ b/src/ui/playlistslider.cpp @@ -29,8 +29,8 @@ PlayListSlider::PlayListSlider(QWidget *parent) : QWidget(parent) { m_skin = Skin::instance(); - m_moving = FALSE; - m_pressed = FALSE; + m_moving = false; + m_pressed = false; m_min = 0; m_max = 0; m_value = 0; @@ -87,8 +87,8 @@ void PlayListSlider::mousePressEvent(QMouseEvent *e) void PlayListSlider::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; - m_pressed = FALSE; + m_moving = false; + m_pressed = false; update(); } diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp index 55f625b36..cc0b352ff 100644 --- a/src/ui/playlisttitlebar.cpp +++ b/src/ui/playlisttitlebar.cpp @@ -32,12 +32,12 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) : PixmapWidget(parent) { - m_active = FALSE; - m_resize = FALSE; + m_active = false; + m_resize = false; m_shade2 = 0; m_model = 0; - m_shaded = FALSE; - m_align = FALSE; + m_shaded = false; + m_align = false; m_skin = Skin::instance(); m_ratio = m_skin->ratio(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); @@ -56,7 +56,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) readSettings(); QSettings settings (Qmmp::configFile(), QSettings::IniFormat); m_pl->resize (settings.value ("PlayList/size", QSize (m_ratio*275, m_ratio*116)).toSize()); - if (settings.value ("PlayList/shaded", FALSE).toBool()) + if (settings.value ("PlayList/shaded", false).toBool()) shade(); resize(m_pl->width(),height()); m_align = true; @@ -171,7 +171,7 @@ void PlayListTitleBar::mousePressEvent(QMouseEvent* event) void PlayListTitleBar::mouseReleaseEvent(QMouseEvent*) { Dock::instance()->updateDock(); - m_resize = FALSE; + m_resize = false; } void PlayListTitleBar::mouseMoveEvent(QMouseEvent* event) diff --git a/src/ui/popupwidget.cpp b/src/ui/popupwidget.cpp index 48711cbc7..d670de459 100644 --- a/src/ui/popupwidget.cpp +++ b/src/ui/popupwidget.cpp @@ -38,7 +38,7 @@ PopupWidget::PopupWidget(QWidget *parent) { setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::Dialog | Qt::FramelessWindowHint); //setFrameStyle(QFrame::Box | QFrame::Plain); - setAttribute(Qt::WA_QuitOnClose, FALSE); + setAttribute(Qt::WA_QuitOnClose, false); m_item = 0; QHBoxLayout *hlayout = new QHBoxLayout(this); //layout m_pixlabel = new QLabel(this); diff --git a/src/ui/positionbar.cpp b/src/ui/positionbar.cpp index c0ec42f84..c27a586fe 100644 --- a/src/ui/positionbar.cpp +++ b/src/ui/positionbar.cpp @@ -36,11 +36,11 @@ PositionBar::PositionBar(QWidget *parent) connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getPosBar()); mw = qobject_cast<MainWindow*>(window()); - m_moving = FALSE; + m_moving = false; m_min = 0; m_max = 0; m_old = m_value = 0; - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_POSBAR)); } @@ -87,13 +87,13 @@ void PositionBar::mouseMoveEvent (QMouseEvent *e) void PositionBar::mouseReleaseEvent(QMouseEvent*) { - draw(FALSE); + draw(false); if (m_value!=m_old && m_max > 0) { m_old = m_value; mw->seek(m_value); } - m_moving = FALSE; + m_moving = false; } void PositionBar::setValue(qint64 v) @@ -101,19 +101,19 @@ void PositionBar::setValue(qint64 v) if (m_moving || m_max == 0) return; m_value = v; - draw(FALSE); + draw(false); } void PositionBar::setMax(qint64 max) { m_max = max; - draw(FALSE); + draw(false); } void PositionBar::updateSkin() { resize(m_skin->getPosBar().size()); - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_POSBAR)); } diff --git a/src/ui/shadedbar.cpp b/src/ui/shadedbar.cpp index b524acd10..bdabbe516 100644 --- a/src/ui/shadedbar.cpp +++ b/src/ui/shadedbar.cpp @@ -38,7 +38,7 @@ ShadedBar::ShadedBar(QWidget *parent, uint slider1, uint slider2, uint slider3) else resize(m_ratio*42,m_ratio*7); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); - m_moving = FALSE; + m_moving = false; m_min = 0; m_max = 100; m_old = m_value = 0; @@ -88,7 +88,7 @@ void ShadedBar::mouseMoveEvent (QMouseEvent *e) void ShadedBar::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; + m_moving = false; draw(); m_old = m_value; } diff --git a/src/ui/skin.cpp b/src/ui/skin.cpp index 225a0e35e..35c01ef2a 100644 --- a/src/ui/skin.cpp +++ b/src/ui/skin.cpp @@ -77,8 +77,8 @@ Skin::~Skin() void Skin::setSkin (const QString& path) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - m_use_cursors = settings.value("General/skin_cursors", FALSE).toBool(); - m_double_size = settings.value("General/double_size", FALSE).toBool(); + m_use_cursors = settings.value("General/skin_cursors", false).toBool(); + m_double_size = settings.value("General/double_size", false).toBool(); settings.setValue("skin_path",path); qDebug ("Skin: using %s",qPrintable(path)); m_skin_dir = QDir (path); diff --git a/src/ui/skinreader.cpp b/src/ui/skinreader.cpp index 69b976636..297493ebf 100644 --- a/src/ui/skinreader.cpp +++ b/src/ui/skinreader.cpp @@ -64,7 +64,7 @@ void SkinReader::generateThumbs() { if (fileInfo.baseName () == thumbFile.baseName ()) { - del = FALSE; + del = false; break; } } @@ -84,7 +84,7 @@ void SkinReader::generateThumbs() { if (fileInfo.baseName () == thumbInfo.baseName ()) { - create = FALSE; + create = false; break; } } @@ -126,9 +126,9 @@ void SkinReader::unpackSkin(const QString &path) dir.remove(file.fileName()); //unpack if (path.endsWith(".tgz") || path.endsWith(".tar.gz") || path.endsWith(".tar.bz2")) - untar(path, QDir::homePath() +"/.qmmp/cache/skin", FALSE); + untar(path, QDir::homePath() +"/.qmmp/cache/skin", false); if (path.endsWith(".zip") || path.endsWith(".wsz")) - unzip(path, QDir::homePath() +"/.qmmp/cache/skin", FALSE); + unzip(path, QDir::homePath() +"/.qmmp/cache/skin", false); } const QStringList SkinReader::skins() diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp index 5328d574b..22b823350 100644 --- a/src/ui/textscroller.cpp +++ b/src/ui/textscroller.cpp @@ -51,7 +51,7 @@ TextScroller::TextScroller ( QWidget *parent ) m_progress = -1; m_metrics = 0; m_text = "Qt-based Multimedia Player (Qmmp " + Qmmp::strVersion() + ")"; - m_update = FALSE; + m_update = false; readSettings(); m_timer = new QTimer ( this ); connect (m_timer, SIGNAL (timeout()), SLOT (addOffset())); @@ -141,7 +141,7 @@ void TextScroller::readSettings() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString fontname = settings.value("MainWindow/Font","").toString(); - m_bitmapConf = settings.value("MainWindow/bitmap_font", FALSE).toBool(); + m_bitmapConf = settings.value("MainWindow/bitmap_font", false).toBool(); m_font.fromString(fontname); if (m_update) @@ -152,7 +152,7 @@ void TextScroller::readSettings() else { m_update = true; - m_bitmap = FALSE; + m_bitmap = false; } m_metrics = new QFontMetrics(m_font); @@ -249,7 +249,7 @@ void TextScroller::mouseReleaseEvent (QMouseEvent *e) else if (e->button() == Qt::LeftButton && m_autoscroll) { m_timer->start(); - m_pressing = FALSE; + m_pressing = false; } else QWidget::mouseReleaseEvent(e); diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp index 02b9d41ac..c628d6acc 100644 --- a/src/ui/titlebar.cpp +++ b/src/ui/titlebar.cpp @@ -37,11 +37,11 @@ TitleBar::TitleBar(QWidget *parent) : PixmapWidget(parent) { - m_align = FALSE; + m_align = false; m_skin = Skin::instance(); setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_A)); m_mw = qobject_cast<MainWindow*>(parent->parent()); - m_shaded = FALSE; + m_shaded = false; m_shade2 = 0; m_currentTime = 0; m_control = 0; @@ -56,10 +56,10 @@ TitleBar::TitleBar(QWidget *parent) connect(m_shade, SIGNAL(clicked()), SLOT(shade())); m_close = new Button(this,Skin::BT_CLOSE_N,Skin::BT_CLOSE_P, Skin::CUR_CLOSE); connect(m_close, SIGNAL(clicked()), m_mw, SLOT(handleCloseRequest())); - setActive(FALSE); + setActive(false); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - if (settings.value("Display/shaded", FALSE).toBool()) + if (settings.value("Display/shaded", false).toBool()) shade(); m_align = true; setCursor(m_skin->getCursor(Skin::CUR_TITLEBAR)); @@ -135,7 +135,7 @@ void TitleBar::setActive(bool a) void TitleBar::updateSkin() { - setActive(FALSE); + setActive(false); setCursor(m_skin->getCursor(Skin::CUR_TITLEBAR)); updatePositions(); } diff --git a/src/ui/togglebutton.cpp b/src/ui/togglebutton.cpp index 5994134ec..994ac9f20 100644 --- a/src/ui/togglebutton.cpp +++ b/src/ui/togglebutton.cpp @@ -32,9 +32,9 @@ ToggleButton::ToggleButton ( QWidget *parent,uint on_n,uint on_p,uint off_n,uint m_on_p = on_p; m_off_n = off_n; m_off_p = off_p; - m_on = FALSE; + m_on = false; skin = Skin::instance(); - setON ( FALSE ); + setON ( false ); connect ( skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) ); } @@ -99,7 +99,7 @@ void ToggleButton::mouseMoveEvent (QMouseEvent *e) else setPixmap ( skin->getButton ( m_on_p ) ); } else if ( m_cursorin && !rect().contains(e->pos()) ) { - m_cursorin = FALSE; + m_cursorin = false; if ( m_old_on ) setPixmap ( skin->getButton ( m_on_n ) ); else diff --git a/src/ui/volumebar.cpp b/src/ui/volumebar.cpp index b0c656d4e..6a4169dae 100644 --- a/src/ui/volumebar.cpp +++ b/src/ui/volumebar.cpp @@ -35,11 +35,11 @@ VolumeBar::VolumeBar(QWidget *parent) : PixmapWidget(parent) connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getVolumeBar(0)); mw = qobject_cast<MainWindow*>(window()); - m_moving = FALSE; + m_moving = false; m_min = 0; m_max = 100; m_old = m_value = 0; - draw(FALSE); + draw(false); } @@ -82,8 +82,8 @@ void VolumeBar::mouseMoveEvent (QMouseEvent *e) void VolumeBar::mouseReleaseEvent(QMouseEvent*) { - m_moving = FALSE; - draw(FALSE); + m_moving = false; + draw(false); m_old = m_value; } @@ -92,19 +92,19 @@ void VolumeBar::setValue(int v) if (m_moving || m_max == 0) return; m_value = v; - draw(FALSE); + draw(false); } void VolumeBar::setMax(int max) { m_max = max; - draw(FALSE); + draw(false); } void VolumeBar::updateSkin() { resize(m_skin->getVolumeBar(0).size()); - draw(FALSE); + draw(false); setCursor(m_skin->getCursor(Skin::CUR_VOLBAL)); } |