Skip to content

Commit

Permalink
Merge branch 'cpp-core-guideline-sf.12' into clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
pcolby committed Jan 4, 2025
2 parents c96e1b2 + fe79607 commit 9f19f98
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/cli/devicecommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <qtpokit/abstractpokitservice.h>
#include <qtpokit/pokitdevice.h>
#include <qtpokit/pokitdiscoveryagent.h>
#include "qtpokit/pokitmeter.h"
#include "qtpokit/pokitpro.h"
#include <qtpokit/pokitmeter.h>
#include <qtpokit/pokitpro.h>

/*!
* \class DeviceCommand
Expand Down
2 changes: 1 addition & 1 deletion src/cli/devicecommand.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define DOKIT_DEVICECOMMAND_H

#include "abstractcommand.h"
#include "qtpokit/pokitproducts.h"
#include <qtpokit/pokitproducts.h>

#include <QLowEnergyController>

Expand Down
2 changes: 1 addition & 1 deletion src/gui/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "models/pokitdevicesmodel.h"

#include "qtpokit/pokitdiscoveryagent.h"
#include <qtpokit/pokitdiscoveryagent.h>

#include <QLoggingCategory>
#include <QMainWindow>
Expand Down
4 changes: 2 additions & 2 deletions src/gui/models/pokitdevicesmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include "pokitdevicesmodel.h"
#include "../resources.h"

#include "qtpokit/pokitdiscoveryagent.h"
#include "qtpokit/pokitproducts.h"
#include <qtpokit/pokitdiscoveryagent.h>
#include <qtpokit/pokitproducts.h>

#include <QBluetoothUuid>
#include <QDebug>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pokitmeter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Declares the PokitMeter namespace.
*/

#include "qtpokit/pokitmeter.h"
#include <qtpokit/pokitmeter.h>

#include <QCoreApplication>
#include <QLoggingCategory>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pokitpro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Defined the PokitPro helper functions.
*/

#include "qtpokit/pokitpro.h"
#include <qtpokit/pokitpro.h>

#include <QCoreApplication>
#include <QLoggingCategory>
Expand Down

0 comments on commit 9f19f98

Please sign in to comment.