summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjosepma <josepma@gmail.com>2016-11-03 22:54:21 +0100
committerjosepma <josepma@gmail.com>2016-11-03 22:54:21 +0100
commit1c020de6e5eda1069c0ea335e56a609c2439157e (patch)
tree2fc29a334165df2714eebac1ce22341cf6335c80
parent773cc21a66ebe1a8abc6e98a92a374e36a9b124e (diff)
more review changes (signed/unsigned)
-rw-r--r--src/library/recording/dlgrecording.cpp6
-rw-r--r--src/library/recording/dlgrecording.h2
-rw-r--r--src/recording/recordingmanager.cpp6
-rw-r--r--src/recording/recordingmanager.h12
4 files changed, 13 insertions, 13 deletions
diff --git a/src/library/recording/dlgrecording.cpp b/src/library/recording/dlgrecording.cpp
index 019a4c32b1..043a9fffd1 100644
--- a/src/library/recording/dlgrecording.cpp
+++ b/src/library/recording/dlgrecording.cpp
@@ -34,8 +34,8 @@ DlgRecording::DlgRecording(QWidget* parent, UserSettingsPointer pConfig,
connect(m_pRecordingManager, SIGNAL(isRecording(bool)),
this, SLOT(slotRecordingEnabled(bool)));
- connect(m_pRecordingManager, SIGNAL(bytesRecorded(long)),
- this, SLOT(slotBytesRecorded(long)));
+ connect(m_pRecordingManager, SIGNAL(bytesRecorded(int)),
+ this, SLOT(slotBytesRecorded(int)));
connect(m_pRecordingManager, SIGNAL(durationRecorded(QString)),
this, SLOT(slotDurationRecorded(QString)));
@@ -129,7 +129,7 @@ void DlgRecording::slotRecordingEnabled(bool isRecording) {
}
// gets number of recorded bytes and update label
-void DlgRecording::slotBytesRecorded(long bytes) {
+void DlgRecording::slotBytesRecorded(int bytes) {
double megabytes = bytes / 1048576.0;
m_bytesRecordedStr = QString::number(megabytes,'f',2);
refreshLabel();
diff --git a/src/library/recording/dlgrecording.h b/src/library/recording/dlgrecording.h
index 0f8db1f42a..53b515bf32 100644
--- a/src/library/recording/dlgrecording.h
+++ b/src/library/recording/dlgrecording.h
@@ -36,7 +36,7 @@ class DlgRecording : public QWidget, public Ui::DlgRecording, public virtual Lib
public slots:
void toggleRecording(bool toggle);
void slotRecordingEnabled(bool);
- void slotBytesRecorded(long);
+ void slotBytesRecorded(int);
void refreshBrowseModel();
void slotRestoreSearch();
void slotDurationRecorded(QString durationRecorded);
diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index 4bb94d040e..417cc2e6ee 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -187,7 +187,7 @@ void RecordingManager::slotDurationRecorded(quint64 duration)
}
}
// Copy from the implementation in enginerecord.cpp
-QString RecordingManager::getRecordedDurationStr(quint64 duration) {
+QString RecordingManager::getRecordedDurationStr(unsigned int duration) {
return QString("%1:%2")
.arg(duration / 60, 2, 'f', 0, '0') // minutes
.arg(duration % 60, 2, 'f', 0, '0'); // seconds
@@ -196,7 +196,7 @@ QString RecordingManager::getRecordedDurationStr(quint64 duration) {
// Only called when recording is active.
void RecordingManager::slotBytesRecorded(int bytes)
{
- // auto conversion to long
+ // auto conversion to quint64
m_iNumberOfBytesRecorded += bytes;
m_iNumberOfBytesRecordedSplit += bytes;
@@ -267,7 +267,7 @@ quint64 RecordingManager::getFileSplitSize()
else
return SIZE_650MB;
}
-int RecordingManager::getFileSplitSeconds()
+unsigned int RecordingManager::getFileSplitSeconds()
{
QString fileSizeStr = m_pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "FileSize"));
if(fileSizeStr == SPLIT_60MIN)
diff --git a/src/recording/recordingmanager.h b/src/recording/recordingmanager.h
index 959ec37164..ac7d3ed1f7 100644
--- a/src/recording/recordingmanager.h
+++ b/src/recording/recordingmanager.h
@@ -46,7 +46,7 @@ class RecordingManager : public QObject
signals:
// Emits the cumulative number of bytes currently recorded.
- void bytesRecorded(long);
+ void bytesRecorded(int);
void isRecording(bool);
void durationRecorded(QString);
@@ -70,7 +70,7 @@ class RecordingManager : public QObject
ControlPushButton* m_pToggleRecording;
quint64 getFileSplitSize();
- int getFileSplitSeconds();
+ unsigned int getFileSplitSeconds();
UserSettingsPointer m_pConfig;
QString m_recordingDir;
@@ -86,11 +86,11 @@ class RecordingManager : public QObject
quint64 m_iNumberOfBytesRecorded;
quint64 m_iNumberOfBytesRecordedSplit;
quint64 m_split_size;
- long m_split_time;
+ unsigned int m_split_time;
int m_iNumberSplits;
- long m_secondsRecorded;
- long m_secondsRecordedSplit;
- QString getRecordedDurationStr(quint64 duration);
+ unsigned int m_secondsRecorded;
+ unsigned int m_secondsRecordedSplit;
+ QString getRecordedDurationStr(unsigned int duration);
};
#endif // RECORDINGMANAGER_H