diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 5e6dd34..8c27bb1 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -30,6 +30,6 @@
-
+
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 6505ae5..02572ae 100644
--- a/main.cpp
+++ b/main.cpp
@@ -171,6 +171,8 @@ int main(int argc, char *argv[]) {
exit(1);
}
+ ui *uiInstance = new ui(argc, argv);
+
char netBuf[8192];
// TEMP: Retreiving test file from HTTP daemon w/ TLS
@@ -180,7 +182,7 @@ int main(int argc, char *argv[]) {
if(ret < 0) {
const PRErrorCode err = PR_GetError();
fprintf(stderr, "Error writing data to socket, code %d: %s\n", err, PR_ErrorToName(err));
-// uiInstance->mainLog->appendPlainText("Error writing data to socket, see stderr.");
+ uiInstance->mainLog->appendPlainText("Error writing data to socket, see stderr.");
}
// Get the response
@@ -188,10 +190,10 @@ int main(int argc, char *argv[]) {
if(ret < 0) {
const PRErrorCode err = PR_GetError();
fprintf(stderr, "Error reading data from socket, code %d: %s\n", err, PR_ErrorToName(err));
-// uiInstance->mainLog->appendPlainText("Error writing data from socket, see stderr.");
+ uiInstance->mainLog->appendPlainText("Error writing data from socket, see stderr.");
} else {
printf("%s\n", netBuf);
-// uiInstance->mainLog->appendPlainText(netBuf);
+ uiInstance->mainLog->appendPlainText(netBuf);
}
if(PR_Shutdown(nssSocket, PR_SHUTDOWN_BOTH) != PR_SUCCESS) {
@@ -204,9 +206,11 @@ int main(int argc, char *argv[]) {
char messageBuf[1024];
sprintf(messageBuf, "Found IP Address: %s", ipString);
-// uiInstance->mainLog->appendPlainText(messageBuf);
+ uiInstance->mainLog->appendPlainText(messageBuf);
+
+ fprintf(stderr, "argc = %d, strlen(argv[0]) = %d\n", argc, (int)strlen(argv[0]));
+
- ui *uiInstance = new ui(argc, argv);
int qAppRetCode = uiInstance->exec();
// Shutdown of NSS
diff --git a/ui.cpp b/ui.cpp
index e14bdf0..a483356 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -1,7 +1,9 @@
#include "ui.h"
ui::ui(int argc, char **argv) {
- app = new QApplication(argc, argv);
+ this->argc = argc;
+ this->argv = argv;
+ app = new QApplication(this->argc, this->argv);
mainWindow = new QWidget();
mainWindow->resize(1280, 720);
mainWindow->setWindowTitle("oksirc - early Qt test");
diff --git a/ui.h b/ui.h
index bcab122..43bd9a0 100644
--- a/ui.h
+++ b/ui.h
@@ -7,6 +7,8 @@ class ui : public QObject {
public:
ui(int, char **);
+ int argc;
+ char **argv;
int exec();
void sendButtonClicked(bool);
void returnOnTextEntry();