Skip to content

Commit

Permalink
Update last changes before 0.2 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
MayaPosch committed Feb 4, 2019
1 parent 937a5d9 commit 0dcb1eb
Show file tree
Hide file tree
Showing 5 changed files with 1,913 additions and 8 deletions.
2 changes: 1 addition & 1 deletion discoverywindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void DiscoveryWindow::clearText() {

// --- RECEIVE MESSAGE ---
// Called when a new message is available.
void DiscoveryWindow::receiveMessage(string topic, string message) {
void DiscoveryWindow::receiveMessage(string topic, string /*message*/) {
set<string>::const_iterator it;
it = topics.find(topic);
if (it == topics.end()) {
Expand Down
2 changes: 1 addition & 1 deletion discoverywindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private slots:
void clearText();

public slots:
void receiveMessage(string topic, string message);
void receiveMessage(string topic, string);

signals:
void addSubscription(string topic);
Expand Down
45 changes: 39 additions & 6 deletions installer/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,30 @@ SectionEnd */
Section "MQTTCute"
SetOutPath $INSTDIR

File "mosquitto.dll"
File "mosquittopp.dll"
;File "mosquitto.dll"
;File "mosquittopp.dll"
File "MQTTCute.exe"
File "pthreadVC2.dll"
;File "pthreadVC2.dll"
File "Qt5Core.dll"
File "Qt5Gui.dll"
File "Qt5Widgets.dll"
File "libbz2-1.dll"
File "libfreetype-6.dll"
File "libgcc_s_seh-1.dll"
File "libglib-2.0-0.dll"
File "libgraphite2.dll"
File "libharfbuzz-0.dll"
File "libiconv-2.dll"
File "libicudt62.dll"
File "libicuin62.dll"
File "libicuuc62.dll"
File "libintl-8.dll"
File "libpcre-1.dll"
File "libpcre2-16-0.dll"
File "libpng16-16.dll"
File "libstdc++-6.dll"
File "zlib1.dll"


;Store installation folder
WriteRegStr HKLM "Software\MQTTCute" "" $INSTDIR
Expand Down Expand Up @@ -111,13 +128,29 @@ SectionEnd
;Uninstaller Section

Section "un.Uninstall Section"
File "mosquitto.dll"
File "mosquittopp.dll"
;File "mosquitto.dll"
;File "mosquittopp.dll"
File "MQTTCute.exe"
File "pthreadVC2.dll"
;File "pthreadVC2.dll"
File "Qt5Core.dll"
File "Qt5Gui.dll"
File "Qt5Widgets.dll"
File "libbz2-1.dll"
File "libfreetype-6.dll"
File "libgcc_s_seh-1.dll"
File "libglib-2.0-0.dll"
File "libgraphite2.dll"
File "libharfbuzz-0.dll"
File "libiconv-2.dll"
File "libicudt62.dll"
File "libicuin62.dll"
File "libicuuc62.dll"
File "libintl-8.dll"
File "libpcre-1.dll"
File "libpcre2-16-0.dll"
File "libpng16-16.dll"
File "libstdc++-6.dll"
File "zlib1.dll"

Delete "$INSTDIR\uninstall.exe"

Expand Down
2 changes: 2 additions & 0 deletions mqttlistener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,13 @@ void MqttListener::publishMessage(string topic, string msg) {

// --- ADD SUBSCRIPTION ---
void MqttListener::addSubscription(string topic) {
cout << "MqttListener: Adding subscription for: " << topic << endl;
subscribe(0, topic.c_str(), 1);
}


// --- REMOVE SUBSCRIPTION ---
void MqttListener::removeSubscription(string topic) {
cout << "MqttListener: Removing subscription for: " << topic << endl;
unsubscribe(0, topic.c_str());
}
Loading

0 comments on commit 0dcb1eb

Please sign in to comment.