Skip to content

Commit

Permalink
Remove unneeded space between double closing angle brackets
Browse files Browse the repository at this point in the history
The space is unnecessary and clang-format complains about it. See
mixxxdj#4547 (comment).

This patch was created using:

    $ find src \( -name "*.h" -o -name "*.cpp" \) -exec sed -i 's/> >/>>/' {} \;
  • Loading branch information
Holzhaus committed Dec 8, 2021
1 parent a7a8716 commit 54a2103
Show file tree
Hide file tree
Showing 35 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion src/control/controlmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ class ControlModel final : public QAbstractTableModel {
ControlProxy* pControl;
};

QVector<QHash<int, QVariant> > m_headerInfo;
QVector<QHash<int, QVariant>> m_headerInfo;
QList<ControlInfo> m_controls;
};
2 changes: 1 addition & 1 deletion src/controllers/controllermappingtablemodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ class ControllerMappingTableModel : public QAbstractTableModel {
// m_pHidMapping points to the HID mapping.
virtual void onMappingLoaded() = 0;

QVector<QHash<int, QVariant> > m_headerInfo;
QVector<QHash<int, QVariant>> m_headerInfo;
std::shared_ptr<LegacyMidiControllerMapping> m_pMidiMapping;
};
2 changes: 1 addition & 1 deletion src/controllers/dlgcontrollerlearning.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ class DlgControllerLearning : public QDialog,
bool m_messagesLearned;
QTimer m_firstMessageTimer;
QTimer m_lastMessageTimer;
QList<QPair<MidiKey, unsigned char> > m_messages;
QList<QPair<MidiKey, unsigned char>> m_messages;
MidiInputMappings m_mappings;
};
2 changes: 1 addition & 1 deletion src/controllers/learningutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct MessageStats {
// static
MidiInputMappings LearningUtils::guessMidiInputMappings(
const ConfigKey& control,
const QList<QPair<MidiKey, unsigned char> >& messages) {
const QList<QPair<MidiKey, unsigned char>>& messages) {
QMap<unsigned char, MessageStats> stats_by_control;
MessageStats stats;

Expand Down
2 changes: 1 addition & 1 deletion src/controllers/learningutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ class LearningUtils {
public:
static MidiInputMappings guessMidiInputMappings(
const ConfigKey& control,
const QList<QPair<MidiKey, unsigned char> >& messages);
const QList<QPair<MidiKey, unsigned char>>& messages);
};
2 changes: 1 addition & 1 deletion src/controllers/legacycontrollermapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class LegacyControllerMapping {
virtual bool isMappable() const = 0;

// Optional list of controller device match details
QList<QHash<QString, QString> > m_productMatches;
QList<QHash<QString, QString>> m_productMatches;

private:
bool m_bDirty;
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/midi/midicontroller.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class MidiController : public Controller {
QList<MidiOutputHandler*> m_outputs;
std::shared_ptr<LegacyMidiControllerMapping> m_pMapping;
SoftTakeoverCtrl m_st;
QList<QPair<MidiInputMapping, unsigned char> > m_fourteen_bit_queued_mappings;
QList<QPair<MidiInputMapping, unsigned char>> m_fourteen_bit_queued_mappings;

// So it can access sendShortMsg()
friend class MidiOutputHandler;
Expand Down
2 changes: 1 addition & 1 deletion src/effects/backends/builtin/parametriceqeffect.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ParametricEQEffectGroupState final : public EffectState {

// These containers are only appended in the constructor which is called on
// the main thread, so there is no risk of allocation in the audio thread.
std::vector<std::unique_ptr<EngineFilterBiquad1Peaking> > m_bands;
std::vector<std::unique_ptr<EngineFilterBiquad1Peaking>> m_bands;
QList<double> m_oldGain;
QList<double> m_oldCenter;
QList<double> m_oldQ;
Expand Down
4 changes: 2 additions & 2 deletions src/effects/backends/effectmanifestparameter.h
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class EffectManifestParameter {
void appendStep(const QPair<QString, double>& step) {
m_steps.append(step);
}
const QList<QPair<QString, double> >& getSteps() const {
const QList<QPair<QString, double>>& getSteps() const {
return m_steps;
}

Expand Down Expand Up @@ -270,7 +270,7 @@ class EffectManifestParameter {
/// effect parameters
/// Each pair has the following form:
/// name - value
QList<QPair<QString, double> > m_steps;
QList<QPair<QString, double>> m_steps;
};

QDebug operator<<(QDebug dbg, const EffectManifestParameter& parameter);
Expand Down
2 changes: 1 addition & 1 deletion src/library/basesqltablemodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class BaseSqlTableModel : public BaseTrackTableModel {
TrackId2Rows m_trackIdToRows;
QString m_currentSearch;
QString m_currentSearchFilter;
QVector<QHash<int, QVariant> > m_headerInfo;
QVector<QHash<int, QVariant>> m_headerInfo;
QString m_trackSourceOrderBy;

DISALLOW_COPY_AND_ASSIGN(BaseSqlTableModel);
Expand Down
2 changes: 1 addition & 1 deletion src/library/basetrackcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class BaseTrackCache : public QObject {

bool m_bIndexBuilt;
bool m_bIsCaching;
QHash<TrackId, QVector<QVariant> > m_trackInfo;
QHash<TrackId, QVector<QVariant>> m_trackInfo;
QSqlDatabase m_database;

DISALLOW_COPY_AND_ASSIGN(BaseTrackCache);
Expand Down
6 changes: 3 additions & 3 deletions src/library/browse/browsetablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ BrowseTableModel::BrowseTableModel(QObject* parent,

setHorizontalHeaderLabels(headerLabels);
// register the QList<T> as a metatype since we use QueuedConnection below
qRegisterMetaType<QList<QList<QStandardItem*> > >(
"QList< QList<QStandardItem*> >");
qRegisterMetaType<QList<QList<QStandardItem*>> >(
"QList< QList<QStandardItem*>>");
qRegisterMetaType<BrowseTableModel*>("BrowseTableModel*");

m_pBrowseThread = BrowseThread::getInstanceRef();
Expand Down Expand Up @@ -354,7 +354,7 @@ void BrowseTableModel::slotClear(BrowseTableModel* caller_object) {
}
}

void BrowseTableModel::slotInsert(const QList<QList<QStandardItem*> >& rows,
void BrowseTableModel::slotInsert(const QList<QList<QStandardItem*>>& rows,
BrowseTableModel* caller_object) {
// There exists more than one BrowseTableModel in Mixxx We only want to
// receive items here, this object has 'ordered' by the BrowserThread
Expand Down
2 changes: 1 addition & 1 deletion src/library/browse/browsetablemodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class BrowseTableModel final : public QStandardItemModel, public virtual TrackMo

public slots:
void slotClear(BrowseTableModel*);
void slotInsert(const QList< QList<QStandardItem*> >&, BrowseTableModel*);
void slotInsert(const QList< QList<QStandardItem*>>&, BrowseTableModel*);
void trackChanged(const QString& group, TrackPointer pNewTrack, TrackPointer pOldTrack);

private:
Expand Down
2 changes: 1 addition & 1 deletion src/library/browse/browsethread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ void BrowseThread::populateModel() {
// see signal/slot connection in BrowseTableModel
emit clearModel(thisModelObserver);

QList< QList<QStandardItem*> > rows;
QList< QList<QStandardItem*>> rows;

int row = 0;
// Iterate over the files
Expand Down
2 changes: 1 addition & 1 deletion src/library/browse/browsethread.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class BrowseThread : public QThread {
static BrowseThreadPointer getInstanceRef();

signals:
void rowsAppended(const QList< QList<QStandardItem*> >&, BrowseTableModel*);
void rowsAppended(const QList< QList<QStandardItem*>>&, BrowseTableModel*);
void clearModel(BrowseTableModel*);

private:
Expand Down
6 changes: 3 additions & 3 deletions src/library/parsercsv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ QList<QString> ParserCsv::parse(const QString& sFilename) {
if (file.open(QIODevice::ReadOnly)) {
QByteArray ba = file.readAll();

QList<QList<QString> > tokens = tokenize(ba, ',');
QList<QList<QString>> tokens = tokenize(ba, ',');

// detect Location column
int loc_coll = 0x7fffffff;
Expand Down Expand Up @@ -76,8 +76,8 @@ QList<QString> ParserCsv::parse(const QString& sFilename) {

// Code was posted at http://www.qtcentre.org/threads/35511-Parsing-CSV-data
// by "adzajac" and adapted to use QT Classes
QList<QList<QString> > ParserCsv::tokenize(const QByteArray& str, char delimiter) {
QList<QList<QString> > tokens;
QList<QList<QString>> ParserCsv::tokenize(const QByteArray& str, char delimiter) {
QList<QList<QString>> tokens;

unsigned int row = 0;
bool quotes = false;
Expand Down
2 changes: 1 addition & 1 deletion src/library/parsercsv.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ParserCsv : public Parser
static bool writeReadableTextFile(const QString &file, BaseSqlTableModel* pPlaylistTableModel, bool writeTimestamp);
private:
/**Reads a line from the file and returns filepath if a valid file**/
QList<QList<QString> > tokenize(const QByteArray& str, char delimiter);
QList<QList<QString>> tokenize(const QByteArray& str, char delimiter);


};
4 changes: 2 additions & 2 deletions src/preferences/upgrade.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,12 +286,12 @@ UserSettingsPointer Upgrade::versionUpgrade(const QString& settingsPath) {
QDir newOSXDir(OSXLocation190);
newOSXDir.mkpath(OSXLocation190);

QList<QPair<QString, QString> > dirsToMove;
QList<QPair<QString, QString>> dirsToMove;
dirsToMove.push_back(QPair<QString, QString>(OSXLocation180, OSXLocation190));
dirsToMove.push_back(QPair<QString, QString>(OSXLocation180 + "/midi", OSXLocation190 + "midi"));
dirsToMove.push_back(QPair<QString, QString>(OSXLocation180 + "/presets", OSXLocation190 + "presets"));

QListIterator<QPair<QString, QString> > dirIt(dirsToMove);
QListIterator<QPair<QString, QString>> dirIt(dirsToMove);
QPair<QString, QString> curPair;
while (dirIt.hasNext())
{
Expand Down
4 changes: 2 additions & 2 deletions src/soundio/sounddevicenetwork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ SoundDeviceError SoundDeviceNetwork::open(bool isClkRefDevice, int syncBuffers)
// clock reference device callback
// This is what should work best.
if (m_iNumOutputChannels) {
m_outputFifo = std::make_unique<FIFO<CSAMPLE> >(
m_outputFifo = std::make_unique<FIFO<CSAMPLE>>(
m_iNumOutputChannels * m_framesPerBuffer * 2);
}
if (m_iNumInputChannels) {
m_inputFifo = std::make_unique<FIFO<CSAMPLE> >(
m_inputFifo = std::make_unique<FIFO<CSAMPLE>>(
m_iNumInputChannels * m_framesPerBuffer * 2);
}

Expand Down
4 changes: 2 additions & 2 deletions src/soundio/sounddevicenetwork.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ class SoundDeviceNetwork : public SoundDevice {
void workerWriteSilence(NetworkOutputStreamWorkerPtr pWorker, int frames);

QSharedPointer<EngineNetworkStream> m_pNetworkStream;
std::unique_ptr<FIFO<CSAMPLE> > m_outputFifo;
std::unique_ptr<FIFO<CSAMPLE> > m_inputFifo;
std::unique_ptr<FIFO<CSAMPLE>> m_outputFifo;
std::unique_ptr<FIFO<CSAMPLE>> m_inputFifo;
bool m_inputDrift;

std::unique_ptr<ControlProxy> m_pMasterAudioLatencyUsage;
Expand Down
2 changes: 1 addition & 1 deletion src/test/learningutilstest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class LearningUtilsTest : public MixxxTest {
return false;
}

QList<QPair<MidiKey, unsigned char> > m_messages;
QList<QPair<MidiKey, unsigned char>> m_messages;
};

TEST_F(LearningUtilsTest, NoteOnButton) {
Expand Down
2 changes: 1 addition & 1 deletion src/track/keys.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#define KEY_MAP_VERSION "KeyMap-1.0"

typedef QList<QPair<mixxx::track::io::key::ChromaticKey, double> > KeyChangeList;
typedef QList<QPair<mixxx::track::io::key::ChromaticKey, double>> KeyChangeList;

class KeyFactory;

Expand Down
2 changes: 1 addition & 1 deletion src/util/lcs.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inline QString LCS(const QString& a, const QString& b) {
const int rows = m + 1;
const int cols = n + 1;

QVector<QVector<int> > M(rows);
QVector<QVector<int>> M(rows);
int longest = 0;
int longest_loc = 0;

Expand Down
6 changes: 3 additions & 3 deletions src/util/messagepipe.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,18 @@ class TwoWayMessagePipe {
MessagePipe<ReceiverMessageType, SenderMessageType>*> makeTwoWayMessagePipe(
int sender_fifo_size,
int receiver_fifo_size) {
QSharedPointer<TwoWayMessagePipe<SenderMessageType, ReceiverMessageType> > pipe(
QSharedPointer<TwoWayMessagePipe<SenderMessageType, ReceiverMessageType>> pipe(
new TwoWayMessagePipe<SenderMessageType, ReceiverMessageType>(
sender_fifo_size, receiver_fifo_size));

return QPair<MessagePipe<SenderMessageType, ReceiverMessageType>*,
MessagePipe<ReceiverMessageType, SenderMessageType>*>(
new MessagePipe<SenderMessageType, ReceiverMessageType>(
pipe->m_receiver_messages, pipe->m_sender_messages,
new ReferenceHolder<TwoWayMessagePipe<SenderMessageType, ReceiverMessageType> >(pipe)),
new ReferenceHolder<TwoWayMessagePipe<SenderMessageType, ReceiverMessageType>>(pipe)),
new MessagePipe<ReceiverMessageType, SenderMessageType>(
pipe->m_sender_messages, pipe->m_receiver_messages,
new ReferenceHolder<TwoWayMessagePipe<SenderMessageType, ReceiverMessageType> >(pipe)));
new ReferenceHolder<TwoWayMessagePipe<SenderMessageType, ReceiverMessageType>>(pipe)));
}

private:
Expand Down
2 changes: 1 addition & 1 deletion src/util/statmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class StatModel final : public QAbstractTableModel {
void statUpdated(const Stat& stat);

private:
QVector<QHash<int, QVariant> > m_headerInfo;
QVector<QHash<int, QVariant>> m_headerInfo;
QList<Stat> m_stats;
QHash<QString, int> m_statNameToRow;
};
2 changes: 1 addition & 1 deletion src/waveform/visualplayposition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ constexpr int kMicrosPerMillis = 1000; // 1 ms contains 1000 µs


//static
QMap<QString, QWeakPointer<VisualPlayPosition> > VisualPlayPosition::m_listVisualPlayPosition;
QMap<QString, QWeakPointer<VisualPlayPosition>> VisualPlayPosition::m_listVisualPlayPosition;
PerformanceTimer VisualPlayPosition::m_timeInfoTime;
double VisualPlayPosition::m_dCallbackEntryToDacSecs = 0;

Expand Down
2 changes: 1 addition & 1 deletion src/waveform/visualplayposition.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class VisualPlayPosition : public QObject {
bool m_valid;
QString m_key;

static QMap<QString, QWeakPointer<VisualPlayPosition> > m_listVisualPlayPosition;
static QMap<QString, QWeakPointer<VisualPlayPosition>> m_listVisualPlayPosition;
// Time info from the Sound device, updated just after audio callback is called
static double m_dCallbackEntryToDacSecs;
// Time stamp for m_timeInfo in main CPU time
Expand Down
2 changes: 1 addition & 1 deletion src/waveform/visualsmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,6 @@ class VisualsManager {
}
}
private:
std::vector<std::unique_ptr<DeckVisuals> > m_deckVisuals;
std::vector<std::unique_ptr<DeckVisuals>> m_deckVisuals;
PerformanceTimer m_cpuTimer;
};
2 changes: 1 addition & 1 deletion src/waveform/vsyncthread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void VSyncThread::vsyncSlotFinished() {
m_semaVsyncSlot.release();
}

void VSyncThread::getAvailableVSyncTypes(QList<QPair<int, QString > >* pList) {
void VSyncThread::getAvailableVSyncTypes(QList<QPair<int, QString >>* pList) {
for (int i = (int)VSyncThread::ST_TIMER; i < (int)VSyncThread::ST_COUNT; i++) {
//if (isAvailable(type)) // TODO
{
Expand Down
2 changes: 1 addition & 1 deletion src/waveform/vsyncthread.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class VSyncThread : public QThread {
void setSwapWait(int sw);
int fromTimerToNextSyncMicros(const PerformanceTimer& timer);
void vsyncSlotFinished();
void getAvailableVSyncTypes(QList<QPair<int, QString > >* list);
void getAvailableVSyncTypes(QList<QPair<int, QString >>* list);
void setupSync(QGLWidget* glw, int index);
void waitUntilSwap(QGLWidget* glw);

Expand Down
2 changes: 1 addition & 1 deletion src/waveform/waveformwidgetfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ void WaveformWidgetFactory::startVSync(GuiTick* pGuiTick, VisualsManager* pVisua
m_vsyncThread->start(QThread::NormalPriority);
}

void WaveformWidgetFactory::getAvailableVSyncTypes(QList<QPair<int, QString > >* pList) {
void WaveformWidgetFactory::getAvailableVSyncTypes(QList<QPair<int, QString >>* pList) {
m_vsyncThread->getAvailableVSyncTypes(pList);
}

Expand Down
2 changes: 1 addition & 1 deletion src/waveform/waveformwidgetfactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
int isOverviewNormalized() const { return m_overviewNormalized;}

const QVector<WaveformWidgetAbstractHandle> getAvailableTypes() const { return m_waveformWidgetHandles;}
void getAvailableVSyncTypes(QList<QPair<int, QString > >* list);
void getAvailableVSyncTypes(QList<QPair<int, QString >>* list);
void destroyWidgets();

void addTimerListener(WVuMeter* pWidget);
Expand Down
2 changes: 1 addition & 1 deletion src/widget/weffectpushbutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void WEffectPushButton::parameterUpdated() {

m_pButtonMenu->clear();
EffectManifestParameterPointer pManifest = m_pEffectParameterSlot->getManifest();
QList<QPair<QString, double> > options;
QList<QPair<QString, double>> options;
if (pManifest) {
options = pManifest->getSteps();
}
Expand Down
6 changes: 3 additions & 3 deletions src/widget/wimagestore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


// static
QHash<QString, std::weak_ptr<QImage> > WImageStore::m_dictionary;
QHash<QString, std::weak_ptr<QImage>> WImageStore::m_dictionary;
QSharedPointer<ImgSource> WImageStore::m_loader
= QSharedPointer<ImgSource>(new ImgLoader());

Expand All @@ -31,7 +31,7 @@ std::shared_ptr<QImage> WImageStore::getImage(const PixmapSource& source, double
// Search for Image in list
QString key = source.getId() + QString::number(scaleFactor);

QHash<QString, std::weak_ptr<QImage> >::iterator it = m_dictionary.find(key);
QHash<QString, std::weak_ptr<QImage>>::iterator it = m_dictionary.find(key);
if (it != m_dictionary.end()) {
//qDebug() << "WImageStore returning cached Image for:" << source.getPath();
return it.value().lock();
Expand Down Expand Up @@ -88,7 +88,7 @@ QImage* WImageStore::getImageNoCache(const PixmapSource& source, double scaleFac

// static
void WImageStore::deleteImage(QImage* p) {
QMutableHashIterator<QString, std::weak_ptr<QImage> >it(m_dictionary);
QMutableHashIterator<QString, std::weak_ptr<QImage>>it(m_dictionary);
while (it.hasNext()) {
if(it.next().value().expired()) {
it.remove();
Expand Down
2 changes: 1 addition & 1 deletion src/widget/wimagestore.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ class WImageStore {
static void deleteImage(QImage* p);

// Dictionary of Images already instantiated
static QHash<QString, std::weak_ptr<QImage> > m_dictionary;
static QHash<QString, std::weak_ptr<QImage>> m_dictionary;
static QSharedPointer<ImgSource> m_loader;
};

0 comments on commit 54a2103

Please sign in to comment.