projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0b8e352
)
Don't use Qt-defined keywords, they can cause problems with other headers.
author
Martin Ling
<martin-git@earth.li>
Sat, 19 Jul 2014 18:15:55 +0000
(19:15 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Wed, 27 Aug 2014 17:45:58 +0000
(19:45 +0200)
36 files changed:
CMakeLists.txt
patch
|
blob
|
history
pv/data/decoderstack.h
patch
|
blob
|
history
pv/device/devinst.h
patch
|
blob
|
history
pv/dialogs/connect.h
patch
|
blob
|
history
pv/dialogs/storeprogress.h
patch
|
blob
|
history
pv/mainwindow.h
patch
|
blob
|
history
pv/popups/probes.h
patch
|
blob
|
history
pv/prop/bool.h
patch
|
blob
|
history
pv/prop/double.h
patch
|
blob
|
history
pv/prop/enum.h
patch
|
blob
|
history
pv/prop/int.h
patch
|
blob
|
history
pv/prop/string.h
patch
|
blob
|
history
pv/sigsession.h
patch
|
blob
|
history
pv/storesession.h
patch
|
blob
|
history
pv/toolbars/samplingbar.h
patch
|
blob
|
history
pv/view/decodetrace.h
patch
|
blob
|
history
pv/view/header.h
patch
|
blob
|
history
pv/view/logicsignal.h
patch
|
blob
|
history
pv/view/marginwidget.h
patch
|
blob
|
history
pv/view/ruler.h
patch
|
blob
|
history
pv/view/signal.h
patch
|
blob
|
history
pv/view/timemarker.h
patch
|
blob
|
history
pv/view/trace.h
patch
|
blob
|
history
pv/view/view.h
patch
|
blob
|
history
pv/view/viewport.h
patch
|
blob
|
history
pv/widgets/colourbutton.h
patch
|
blob
|
history
pv/widgets/colourpopup.h
patch
|
blob
|
history
pv/widgets/decodergroupbox.h
patch
|
blob
|
history
pv/widgets/decodermenu.h
patch
|
blob
|
history
pv/widgets/popup.h
patch
|
blob
|
history
pv/widgets/popuptoolbutton.h
patch
|
blob
|
history
pv/widgets/sweeptimingwidget.h
patch
|
blob
|
history
pv/widgets/wellarray.cpp
patch
|
blob
|
history
pv/widgets/wellarray.h
patch
|
blob
|
history
signalhandler.cpp
patch
|
blob
|
history
signalhandler.h
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 069ccd898b8be8501434840c16db3c28325b1750..a8cd6c7bfec8aaf7ab60a0d9b69d30ec598e3091 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-275,7
+275,7
@@
endif()
#= Global Definitions
#-------------------------------------------------------------------------------
#= Global Definitions
#-------------------------------------------------------------------------------
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS}
-DQT_NO_KEYWORDS
)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)
diff --git
a/pv/data/decoderstack.h
b/pv/data/decoderstack.h
index 16a7c0cf957961a3d52053b14689e9f4e5fb7438..35f76874bc77bfbc40230aa51d956b7380bed7a5 100644
(file)
--- a/
pv/data/decoderstack.h
+++ b/
pv/data/decoderstack.h
@@
-118,14
+118,14
@@
private:
static void annotation_callback(srd_proto_data *pdata,
void *decoder);
static void annotation_callback(srd_proto_data *pdata,
void *decoder);
-private
slots
:
+private
Q_SLOTS
:
void on_new_frame();
void on_data_received();
void on_frame_ended();
void on_new_frame();
void on_data_received();
void on_frame_ended();
-
signals
:
+
Q_SIGNALS
:
void new_decode_data();
private:
void new_decode_data();
private:
diff --git
a/pv/device/devinst.h
b/pv/device/devinst.h
index 0443d3ea339c6edd36bf70d7cbc8daf903d34721..4f0b6dec3137fedf5f679b4b015f27cacee02703 100644
(file)
--- a/
pv/device/devinst.h
+++ b/
pv/device/devinst.h
@@
-81,7
+81,7
@@
public:
virtual void run();
virtual void run();
-
signals
:
+
Q_SIGNALS
:
void config_changed();
protected:
void config_changed();
protected:
diff --git
a/pv/dialogs/connect.h
b/pv/dialogs/connect.h
index a3f05ee1a6a224e1936843d11b2b30b508a50103..e1a2c30d6c68422fbc37858c2be491702860e42d 100644
(file)
--- a/
pv/dialogs/connect.h
+++ b/
pv/dialogs/connect.h
@@
-61,7
+61,7
@@
private:
void set_serial_connection();
void set_serial_connection();
-private
slots
:
+private
Q_SLOTS
:
void device_selected(int index);
void scan_pressed();
void device_selected(int index);
void scan_pressed();
diff --git
a/pv/dialogs/storeprogress.h
b/pv/dialogs/storeprogress.h
index 7d53832ab8cf6c2bbf189c646ff0c3e442fb48e5..eaf235f340c5320350445677cfb71dd9d76c2077 100644
(file)
--- a/
pv/dialogs/storeprogress.h
+++ b/
pv/dialogs/storeprogress.h
@@
-51,7
+51,7
@@
private:
void closeEvent(QCloseEvent*);
void closeEvent(QCloseEvent*);
-private
slots
:
+private
Q_SLOTS
:
void on_progress_updated();
private:
void on_progress_updated();
private:
diff --git
a/pv/mainwindow.h
b/pv/mainwindow.h
index f026e8f3f38e0326304283c62164d76638c32803..41c55ba5ca9c11f2d6282c497831c9ad83985d4f 100644
(file)
--- a/
pv/mainwindow.h
+++ b/
pv/mainwindow.h
@@
-72,7
+72,7
@@
private:
*/
void update_device_list();
*/
void update_device_list();
-private
slots
:
+private
Q_SLOTS
:
void load_file(QString file_name);
void load_file(QString file_name);
diff --git
a/pv/popups/probes.h
b/pv/popups/probes.h
index 4265c1597274eef0f27b35d4fe8a28fbf72abbdf..434d03986378cb048944bbe8c05d412d06b3ab38 100644
(file)
--- a/
pv/popups/probes.h
+++ b/
pv/popups/probes.h
@@
-72,7
+72,7
@@
private:
private:
void showEvent(QShowEvent *e);
private:
void showEvent(QShowEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void on_probe_checked(QWidget *widget);
void enable_all_probes();
void on_probe_checked(QWidget *widget);
void enable_all_probes();
diff --git
a/pv/prop/bool.h
b/pv/prop/bool.h
index 0d8e205e87a682976b417e3b796fc7ca0e16eb9f..c96c87af2fd03d3c2b86040382fc2e57a12a1324 100644
(file)
--- a/
pv/prop/bool.h
+++ b/
pv/prop/bool.h
@@
-42,7
+42,7
@@
public:
void commit();
void commit();
-private
slots
:
+private
Q_SLOTS
:
void on_state_changed(int);
private:
void on_state_changed(int);
private:
diff --git
a/pv/prop/double.h
b/pv/prop/double.h
index ba4c5958945c76a8653a119ab16f4faa5eac791f..0dd0ba373dd12b1f9e7e27e03264eb826f7bd1c8 100644
(file)
--- a/
pv/prop/double.h
+++ b/
pv/prop/double.h
@@
-49,7
+49,7
@@
public:
void commit();
void commit();
-private
slots
:
+private
Q_SLOTS
:
void on_value_changed(double);
private:
void on_value_changed(double);
private:
diff --git
a/pv/prop/enum.h
b/pv/prop/enum.h
index a7e6ed8d53f58bdcf8f5418ad7e695b1677e72e3..eff6647afd40974314b8a1218d9182ce98024909 100644
(file)
--- a/
pv/prop/enum.h
+++ b/
pv/prop/enum.h
@@
-45,7
+45,7
@@
public:
void commit();
void commit();
-private
slots
:
+private
Q_SLOTS
:
void on_current_item_changed(int);
private:
void on_current_item_changed(int);
private:
diff --git
a/pv/prop/int.h
b/pv/prop/int.h
index 6d910cdf4429b383fe5153bf71b66562d9e2c8c1..1a3180a1a9ab324950a1beafc08bdabb48e59159 100644
(file)
--- a/
pv/prop/int.h
+++ b/
pv/prop/int.h
@@
-47,7
+47,7
@@
public:
void commit();
void commit();
-private
slots
:
+private
Q_SLOTS
:
void on_value_changed(int);
private:
void on_value_changed(int);
private:
diff --git
a/pv/prop/string.h
b/pv/prop/string.h
index d54635fe75bcbc3368a887e89b7518147bb5cfd9..01c7e78b104fb5662e2ef8294ffc79a06dea6b47 100644
(file)
--- a/
pv/prop/string.h
+++ b/
pv/prop/string.h
@@
-39,7
+39,7
@@
public:
void commit();
void commit();
-private
slots
:
+private
Q_SLOTS
:
void on_text_edited(const QString&);
private:
void on_text_edited(const QString&);
private:
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index d1f11ea9682767131757758139437468f6752140..a06de7e14db9ae7e83813932d95c7fec1ae8a5cc 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-180,7
+180,7
@@
private:
std::thread _sampling_thread;
std::thread _sampling_thread;
-
signals
:
+
Q_SIGNALS
:
void capture_state_changed(int state);
void signals_changed();
void capture_state_changed(int state);
void signals_changed();
diff --git
a/pv/storesession.h
b/pv/storesession.h
index ffe1facd742c9b5a194ed4bb75fc2e69f4e4b40e..83664274b553348ddc459e3a7101762f40a659a5 100644
(file)
--- a/
pv/storesession.h
+++ b/
pv/storesession.h
@@
-64,7
+64,7
@@
public:
private:
void store_proc(std::shared_ptr<pv::data::LogicSnapshot> snapshot);
private:
void store_proc(std::shared_ptr<pv::data::LogicSnapshot> snapshot);
-
signals
:
+
Q_SIGNALS
:
void progress_updated();
private:
void progress_updated();
private:
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index 2c2431c427a71ccb0fa3ff166b38503737d8edb9..0f4c2ee5549b92cd2c3d9f40c168b1fa9b690207 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-69,7
+69,7
@@
public:
void set_capture_state(pv::SigSession::capture_state state);
void set_capture_state(pv::SigSession::capture_state state);
-
signals
:
+
Q_SIGNALS
:
void run_stop();
private:
void run_stop();
private:
@@
-80,7
+80,7
@@
private:
void commit_sample_rate();
void commit_sample_count();
void commit_sample_rate();
void commit_sample_count();
-private
slots
:
+private
Q_SLOTS
:
void on_device_selected();
void on_sample_count_changed();
void on_sample_rate_changed();
void on_device_selected();
void on_sample_count_changed();
void on_sample_rate_changed();
diff --git
a/pv/view/decodetrace.h
b/pv/view/decodetrace.h
index b2ff2b59518411192007a021ff9990971348f3bf..4b3bc3dec21ca6322cb4de879ebb01ffab020e75 100644
(file)
--- a/
pv/view/decodetrace.h
+++ b/
pv/view/decodetrace.h
@@
-154,7
+154,7
@@
private:
void commit_probes();
void commit_probes();
-private
slots
:
+private
Q_SLOTS
:
void on_new_decode_data();
void on_delete();
void on_new_decode_data();
void on_delete();
diff --git
a/pv/view/header.h
b/pv/view/header.h
index eed1d1e17b0e49d2d71908f29fae7f576b1afee9..7759652e402d5cbc38b4f760d675a5a8d0359006 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-73,14
+73,14
@@
private:
void keyPressEvent(QKeyEvent *e);
void keyPressEvent(QKeyEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void on_signals_changed();
void on_signals_moved();
void on_trace_changed();
void on_signals_changed();
void on_signals_moved();
void on_trace_changed();
-
signals
:
+
Q_SIGNALS
:
void signals_moved();
private:
void signals_moved();
private:
diff --git
a/pv/view/logicsignal.h
b/pv/view/logicsignal.h
index de1f2ec8e50b4a24da231843bd47d5e44c85c6fa..4e10d7179b9d75f0cb54333b3caa0d635c9c683f 100644
(file)
--- a/
pv/view/logicsignal.h
+++ b/
pv/view/logicsignal.h
@@
-87,7
+87,7
@@
private:
int action_match(QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
int action_match(QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
-private
slots
:
+private
Q_SLOTS
:
void on_trigger();
private:
void on_trigger();
private:
diff --git
a/pv/view/marginwidget.h
b/pv/view/marginwidget.h
index 89eb3de128f1cd1481a073e8e29ccab45684aae3..7811d80aa6d85f46829542b3d3f7c299e2cd2d89 100644
(file)
--- a/
pv/view/marginwidget.h
+++ b/
pv/view/marginwidget.h
@@
-35,10
+35,10
@@
class MarginWidget : public QWidget
public:
MarginWidget(pv::view::View &parent);
public:
MarginWidget(pv::view::View &parent);
-public
slots
:
+public
Q_SLOTS
:
virtual void clear_selection();
virtual void clear_selection();
-
signals
:
+
Q_SIGNALS
:
void selection_changed();
void geometry_updated();
void selection_changed();
void geometry_updated();
diff --git
a/pv/view/ruler.h
b/pv/view/ruler.h
index 08a9c0e1fdf0128827bbc4c4c016fccd60d8fb2d..00fac244ba7c46eabfb9467b4dad103da0d0c9e9 100644
(file)
--- a/
pv/view/ruler.h
+++ b/
pv/view/ruler.h
@@
-66,7
+66,7
@@
private:
*/
void draw_hover_mark(QPainter &p);
*/
void draw_hover_mark(QPainter &p);
-private
slots
:
+private
Q_SLOTS
:
void hover_point_changed();
};
void hover_point_changed();
};
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index c003de698e3328e9301d1d9148698c3886333d75..d62709729cbcfe760f376de6d83b663698c43a88 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-77,7
+77,7
@@
public:
bool eventFilter(QObject *obj, QEvent *evt);
bool eventFilter(QObject *obj, QEvent *evt);
-private
slots
:
+private
Q_SLOTS
:
void on_disable();
protected:
void on_disable();
protected:
diff --git
a/pv/view/timemarker.h
b/pv/view/timemarker.h
index fc058c2713134bab227eeb6ec0cece3c1d0f43a1..ec34fb5668a1a89a6db2f03bc21753e8a0dfe4ce 100644
(file)
--- a/
pv/view/timemarker.h
+++ b/
pv/view/timemarker.h
@@
-88,10
+88,10
@@
public:
pv::widgets::Popup* create_popup(QWidget *parent);
pv::widgets::Popup* create_popup(QWidget *parent);
-private
slots
:
+private
Q_SLOTS
:
void on_value_changed(double value);
void on_value_changed(double value);
-
signals
:
+
Q_SIGNALS
:
void time_changed();
protected:
void time_changed();
protected:
diff --git
a/pv/view/trace.h
b/pv/view/trace.h
index b82aaa6f792871c451be5a706478e499486e82bb..71ad4953d84dc8f37f6f3c2418ef7a554ee0eda4 100644
(file)
--- a/
pv/view/trace.h
+++ b/
pv/view/trace.h
@@
-175,14
+175,14
@@
protected:
void close_popup();
void close_popup();
-private
slots
:
+private
Q_SLOTS
:
void on_text_changed(const QString &text);
void on_colour_changed(const QColor &colour);
void on_popup_closed();
void on_text_changed(const QString &text);
void on_colour_changed(const QColor &colour);
void on_popup_closed();
-
signals
:
+
Q_SIGNALS
:
void visibility_changed();
void text_changed();
void colour_changed();
void visibility_changed();
void text_changed();
void colour_changed();
diff --git
a/pv/view/view.h
b/pv/view/view.h
index 85e990f7464660fe596635f2b41018cc5527bdca..021767dba6a197ea551effd1f6068da2c3c0e20c 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-136,7
+136,7
@@
public:
void update_viewport();
void update_viewport();
-
signals
:
+
Q_SIGNALS
:
void hover_point_changed();
void signals_moved();
void hover_point_changed();
void signals_moved();
@@
-171,7
+171,7
@@
private:
void resizeEvent(QResizeEvent *e);
void resizeEvent(QResizeEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void h_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
void h_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
diff --git
a/pv/view/viewport.h
b/pv/view/viewport.h
index f7c8028754a1f27f1f7d93a2005d458fd9e991e1..10b88b4c01d413e4d9a96fa5f1f96562d8836aed 100644
(file)
--- a/
pv/view/viewport.h
+++ b/
pv/view/viewport.h
@@
-55,7
+55,7
@@
private:
void wheelEvent(QWheelEvent *event);
bool touchEvent(QTouchEvent *e);
void wheelEvent(QWheelEvent *event);
bool touchEvent(QTouchEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void on_signals_changed();
void on_signals_moved();
void on_signals_changed();
void on_signals_moved();
diff --git
a/pv/widgets/colourbutton.h
b/pv/widgets/colourbutton.h
index 45a3ffffef0908655b5cd61c070a0a9f6e4b3e47..2e62e43c1a577f55ec422624765489bb37b62947 100644
(file)
--- a/
pv/widgets/colourbutton.h
+++ b/
pv/widgets/colourbutton.h
@@
-49,12
+49,12
@@
public:
private:
void paintEvent(QPaintEvent *e);
private:
void paintEvent(QPaintEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void on_clicked(bool);
void on_selected(int row, int col);
void on_clicked(bool);
void on_selected(int row, int col);
-
signals
:
+
Q_SIGNALS
:
void selected(const QColor &colour);
private:
void selected(const QColor &colour);
private:
diff --git
a/pv/widgets/colourpopup.h
b/pv/widgets/colourpopup.h
index 4f5c52e3916ff7d4dbf48762ee84dc7bf120d0ba..4f2276285a8e9331ad25a532daf5ebacf9f07236 100644
(file)
--- a/
pv/widgets/colourpopup.h
+++ b/
pv/widgets/colourpopup.h
@@
-38,10
+38,10
@@
public:
QWellArray& well_array();
QWellArray& well_array();
-
signals
:
+
Q_SIGNALS
:
void selected(int row, int col);
void selected(int row, int col);
-private
slots
:
+private
Q_SLOTS
:
void colour_selected(int, int);
private:
void colour_selected(int, int);
private:
diff --git
a/pv/widgets/decodergroupbox.h
b/pv/widgets/decodergroupbox.h
index 2302a979c5b69d7cf7ff22a735f654ee552581fb..e2953917393e131f806e484f4adc8fbbc05f7f5f 100644
(file)
--- a/
pv/widgets/decodergroupbox.h
+++ b/
pv/widgets/decodergroupbox.h
@@
-40,7
+40,7
@@
public:
void set_decoder_visible(bool visible);
void set_decoder_visible(bool visible);
-
signals
:
+
Q_SIGNALS
:
void delete_decoder();
void show_hide_decoder();
void delete_decoder();
void show_hide_decoder();
diff --git
a/pv/widgets/decodermenu.h
b/pv/widgets/decodermenu.h
index 20dd41203684d2219378c41a9d14c9d0cb63a04e..bfe087e906b46f4dc39c8854d3282fa1c6e7a6b7 100644
(file)
--- a/
pv/widgets/decodermenu.h
+++ b/
pv/widgets/decodermenu.h
@@
-40,10
+40,10
@@
private:
static int decoder_name_cmp(const void *a, const void *b);
static int decoder_name_cmp(const void *a, const void *b);
-private
slots
:
+private
Q_SLOTS
:
void on_action(QObject *action);
void on_action(QObject *action);
-
signals
:
+
Q_SIGNALS
:
void decoder_selected(srd_decoder *decoder);
private:
void decoder_selected(srd_decoder *decoder);
private:
diff --git
a/pv/widgets/popup.h
b/pv/widgets/popup.h
index 0bc6d0ff819642a72a10042a1ed9ee920ac636bc..ec123048074ec9074d18b436e3667d9347de9ac3 100644
(file)
--- a/
pv/widgets/popup.h
+++ b/
pv/widgets/popup.h
@@
-79,7
+79,7
@@
private:
protected:
void showEvent(QShowEvent *e);
protected:
void showEvent(QShowEvent *e);
-
signals
:
+
Q_SIGNALS
:
void closed();
private:
void closed();
private:
diff --git
a/pv/widgets/popuptoolbutton.h
b/pv/widgets/popuptoolbutton.h
index b619b6fd59891fab4052383fff320239a3c5811b..bbc04f5ed5a822e67838a105cb3a2b8784d7da33 100644
(file)
--- a/
pv/widgets/popuptoolbutton.h
+++ b/
pv/widgets/popuptoolbutton.h
@@
-39,7
+39,7
@@
public:
void set_popup(Popup *popup);
void set_popup(Popup *popup);
-private
slots
:
+private
Q_SLOTS
:
void on_clicked(bool);
private:
void on_clicked(bool);
private:
diff --git
a/pv/widgets/sweeptimingwidget.h
b/pv/widgets/sweeptimingwidget.h
index b66188fa31be5af876a5bdc114f5eaf8045205e3..fc83c2042a289874fb02fd51b883ac95c45b00eb 100644
(file)
--- a/
pv/widgets/sweeptimingwidget.h
+++ b/
pv/widgets/sweeptimingwidget.h
@@
-55,7
+55,7
@@
public:
uint64_t value() const;
void set_value(uint64_t value);
uint64_t value() const;
void set_value(uint64_t value);
-
signals
:
+
Q_SIGNALS
:
void value_changed();
private:
void value_changed();
private:
diff --git
a/pv/widgets/wellarray.cpp
b/pv/widgets/wellarray.cpp
index dcc3b417e146474a3b26cfea0f07d60ade86ccb6..fb674431c0e6a054613707ddbf33ff142541e5bc 100644
(file)
--- a/
pv/widgets/wellarray.cpp
+++ b/
pv/widgets/wellarray.cpp
@@
-217,7
+217,7
@@
void QWellArray::setSelected(int row, int col)
updateCell(oldRow, oldCol);
updateCell(selRow, selCol);
if (row >= 0)
updateCell(oldRow, oldCol);
updateCell(selRow, selCol);
if (row >= 0)
-
emit
selected(row, col);
+
Q_EMIT
selected(row, col);
}
void QWellArray::focusInEvent(QFocusEvent*)
}
void QWellArray::focusInEvent(QFocusEvent*)
diff --git
a/pv/widgets/wellarray.h
b/pv/widgets/wellarray.h
index dad088ccc53be0f47ee6aa4b076897457f27208b..ebe3c00019023c7370c060ef3a59d6ba6319269c 100644
(file)
--- a/
pv/widgets/wellarray.h
+++ b/
pv/widgets/wellarray.h
@@
-104,7
+104,7
@@
public:
inline void updateCell(int row, int column) { update(cellGeometry(row, column)); }
inline void updateCell(int row, int column) { update(cellGeometry(row, column)); }
-
signals
:
+
Q_SIGNALS
:
void selected(int row, int col);
protected:
void selected(int row, int col);
protected:
diff --git
a/signalhandler.cpp
b/signalhandler.cpp
index 8c9244b3c269aa32992db7bce55af01e51f9229c..a236535ce1c6fe35724136e2ce5404b8c4f2fd5a 100644
(file)
--- a/
signalhandler.cpp
+++ b/
signalhandler.cpp
@@
-75,10
+75,10
@@
void SignalHandler::on_socket_notifier_activated()
switch(sig_number)
{
case SIGINT:
switch(sig_number)
{
case SIGINT:
-
emit
int_received();
+
Q_EMIT
int_received();
break;
case SIGTERM:
break;
case SIGTERM:
-
emit
term_received();
+
Q_EMIT
term_received();
break;
}
break;
}
diff --git
a/signalhandler.h
b/signalhandler.h
index 7ecd612993a1f5c6d156fc41f00ee02055e3e671..9ca995f73491c7a7540ae19ab85db85bd4279cf9 100644
(file)
--- a/
signalhandler.h
+++ b/
signalhandler.h
@@
-35,11
+35,11
@@
public:
public:
explicit SignalHandler(QObject* parent = NULL);
public:
explicit SignalHandler(QObject* parent = NULL);
-
signals
:
+
Q_SIGNALS
:
void int_received();
void term_received();
void int_received();
void term_received();
-private
slots
:
+private
Q_SLOTS
:
void on_socket_notifier_activated();
private:
void on_socket_notifier_activated();
private: