Skip to content

Commit b1f8a9c

Browse files
committed
Ran clang-format
1 parent 879d4e7 commit b1f8a9c

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

include/vsgQt/Viewer.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@ namespace vsgQt
2424
// forward declare
2525
class Window;
2626

27-
2827
class VSGQT_DECLSPEC Viewer : public vsg::Inherit<vsg::Viewer, Viewer>
2928
{
3029
public:
31-
3230
/// Create Viewer.
3331
/// If msecTimerInterval is > 0 then call setInterval(msecTimerInterval) to set up QTime to call Viewer::render() at this interval,
34-
/// otherwise the redraw is left application to call Viewer::render() when required, call Viewer::setInverval() to set up the timer,
35-
/// or to call the underlying vsg::Viewer methods for rendering a framne within the application when the viewer needs to redraw a frame.
32+
/// otherwise the redraw is left application to call Viewer::render() when required, call Viewer::setInverval() to set up the timer,
33+
/// or to call the underlying vsg::Viewer methods for rendering a framne within the application when the viewer needs to redraw a frame.
3634
Viewer(int msecTimerInterval = 0);
3735

3836
QTimer timer;
@@ -51,7 +49,6 @@ namespace vsgQt
5149

5250
/// set the QTimer interval in milliseconds, this controls how often the Viewer::render() is called
5351
void setInterval(int msecTimerInterval);
54-
5552
};
5653

5754
} // namespace vsgQt

include/vsgQt/Window.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ namespace vsgQt
4747
virtual void initializeWindow();
4848

4949
protected:
50-
5150
void cleanup();
5251

5352
bool event(QEvent* e) override;

src/vsgQt/KeyboardMap.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,12 @@ bool KeyboardMap::getKeySymbol(const QKeyEvent* e, vsg::KeySymbol& keySymbol, vs
199199
else
200200
{
201201
keySymbol = vsg::KeySymbol(e->key());
202-
if (keySymbol>='A' && keySymbol<='Z') keySymbol = vsg::KeySymbol(int(keySymbol) + int('a'-'A'));
202+
if (keySymbol >= 'A' && keySymbol <= 'Z') keySymbol = vsg::KeySymbol(int(keySymbol) + int('a' - 'A'));
203203

204204
modifiedKeySymbol = vsg::KeySymbol(*(e->text().toLatin1().data()));
205205

206206
// std::cout<<"KeyboardMap::getKeySymbol() NOT found in map, keySymbol = "<<keySymbol<<" "<<char(keySymbol)<< ", modifiedKeySymbol = "<<modifiedKeySymbol<<" "<<char(modifiedKeySymbol)<<std::endl;
207207
}
208208

209-
210209
return true;
211210
}

src/vsgQt/Viewer.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
3535

3636
using namespace vsgQt;
3737

38-
3938
Viewer::Viewer(int msecTimerInterval)
4039
{
4140
// set the default timer as 8ms.
4241
if (msecTimerInterval > 0) setInterval(msecTimerInterval);
4342
}
4443

45-
4644
bool Viewer::pollEvents(bool discardPreviousEvents)
4745
{
4846
if (discardPreviousEvents) _events.clear();
@@ -89,6 +87,6 @@ void Viewer::render(double simulationTime)
8987
void Viewer::setInterval(int msecTimerInterval)
9088
{
9189
timer.setInterval(msecTimerInterval);
92-
timer.connect(&timer, &QTimer::timeout, [&](){ render(); } );
90+
timer.connect(&timer, &QTimer::timeout, [&]() { render(); });
9391
timer.start();
9492
}

src/vsgQt/Window.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Window::Window(vsg::ref_ptr<vsg::WindowTraits> in_traits, QScreen* targetScreen)
6767
}
6868
else
6969
{
70-
traits =vsg::WindowTraits::create();
70+
traits = vsg::WindowTraits::create();
7171
traits->x = x();
7272
traits->y = y();
7373
traits->width = width();
@@ -86,7 +86,7 @@ Window::Window(vsg::ref_ptr<vsg::WindowTraits> in_traits, QWindow* parent) :
8686
}
8787
else
8888
{
89-
traits =vsg::WindowTraits::create();
89+
traits = vsg::WindowTraits::create();
9090
traits->x = x();
9191
traits->y = y();
9292
traits->width = width();
@@ -106,7 +106,7 @@ Window::Window(vsg::ref_ptr<vsgQt::Viewer> in_viewer, vsg::ref_ptr<vsg::WindowTr
106106
}
107107
else
108108
{
109-
traits =vsg::WindowTraits::create();
109+
traits = vsg::WindowTraits::create();
110110
traits->x = x();
111111
traits->y = y();
112112
traits->width = width();
@@ -126,7 +126,7 @@ Window::Window(vsg::ref_ptr<vsgQt::Viewer> in_viewer, vsg::ref_ptr<vsg::WindowTr
126126
}
127127
else
128128
{
129-
traits =vsg::WindowTraits::create();
129+
traits = vsg::WindowTraits::create();
130130
traits->x = x();
131131
traits->y = y();
132132
traits->width = width();
@@ -182,7 +182,6 @@ void Window::cleanup()
182182
viewer = {};
183183
}
184184

185-
186185
bool Window::event(QEvent* e)
187186
{
188187
switch (e->type())

0 commit comments

Comments
 (0)