diff options
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | muse2/muse/widgets/bigtime.cpp | 6 | ||||
| -rw-r--r-- | muse2/muse/widgets/intlabel.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt index c2bb92cc..0967e58d 100644 --- a/muse2/CMakeLists.txt +++ b/muse2/CMakeLists.txt @@ -37,7 +37,7 @@ IF(NOT DEFINED SHARE_INSTALL_PREFIX) SET(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share") ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX) -#set(CMAKE_BUILD_TYPE debug) +set(CMAKE_BUILD_TYPE debug) #set(CMAKE_BUILD_TYPE release) # If no CMAKE_BUILD_TYPE is given on the command line, @@ -54,7 +54,7 @@ ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX) # for debugging the make system uncomment next line: -# set(CMAKE_VERBOSE_MAKEFILE ON) +set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) set(CMAKE_SKIP_RULE_DEPENDENCY TRUE) @@ -150,7 +150,7 @@ if (NOT QT4_FOUND) endif (NOT QT4_FOUND) # Needed for plugins factory: -SET(QT_USE_QTUITOOLS TRUE) +#SET(QT_USE_QTUITOOLS TRUE) include(${QT_USE_FILE}) @@ -188,8 +188,8 @@ include_directories(${SAMPLERATE_INCLUDE_DIRS}) ## find libuuid ## -PKG_CHECK_MODULES(UUID REQUIRED uuid>=0.0.1) -include_directories(${UUID_INCLUDE_DIRS}) +#PKG_CHECK_MODULES(UUID REQUIRED uuid>=0.0.1) +#include_directories(${UUID_INCLUDE_DIRS}) ## ## find jack >= 0.103.0 diff --git a/muse2/muse/widgets/bigtime.cpp b/muse2/muse/widgets/bigtime.cpp index 479f4103..b47773c8 100644 --- a/muse2/muse/widgets/bigtime.cpp +++ b/muse2/muse/widgets/bigtime.cpp @@ -1,5 +1,5 @@ #include <stdio.h> -#include <values.h> +#include <limits.h> #include <QCheckBox> #include <QLabel> @@ -65,7 +65,7 @@ BigTime::BigTime(QWidget* parent) //oldbar = oldbeat = oldtick = oldhour = oldmin = oldsec = oldframe = -1; oldbar = oldbeat = oldtick = oldmin = oldsec = oldframe = oldsubframe = -1; oldAbsTick = oldAbsFrame = -1; - setString(MAXINT); + setString(INT_MAX); dwin->setStyleSheet("font-size:10px; font-family:'Courier'; "); // Tim p4.0.8 @@ -185,7 +185,7 @@ void BigTime::closeEvent(QCloseEvent *ev) bool BigTime::setString(unsigned v) { - if (v == MAXINT) { + if (v == INT_MAX) { barLabel->setText(QString("----")); beatLabel->setText(QString("--")); tickLabel->setText(QString("---")); diff --git a/muse2/muse/widgets/intlabel.h b/muse2/muse/widgets/intlabel.h index df452891..cb5c3ecc 100644 --- a/muse2/muse/widgets/intlabel.h +++ b/muse2/muse/widgets/intlabel.h @@ -8,7 +8,7 @@ #ifndef __INTLABEL_H__ #define __INTLABEL_H__ -#include <values.h> +#include <limits.h> #include "nentry.h" class QString; @@ -35,7 +35,7 @@ class IntLabel : public Nentry { void valueChanged(int); public: - IntLabel(int, int, int, QWidget*, int _off = MAXINT, + IntLabel(int, int, int, QWidget*, int _off = INT_MAX, const QString& = QString(""), int lpos = 0); void setOff(int v); void setSuffix(const QString& s) { suffix = s; } |