Separate UI to new file, still not quite complete.

Also fixed code style in files, and settings used by CLion.

.idea/codeStyleSettings.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <Objective-C-extensions>
+          <file>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+          </file>
+          <class>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+          </class>
+          <extensions>
+            <pair source="cpp" header="h" />
+            <pair source="c" header="h" />
+          </extensions>
+        </Objective-C-extensions>
+      </value>
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>

CMakeLists.txt

@@ -11,7 +11,7 @@ find_package(Qt5Widgets REQUIRED)
 
 include_directories(${NSPR_INCLUDE_DIRS} ${NSS_INCLUDE_DIRS})
 
-set(SOURCE_FILES main.cpp dns.cpp)
+set(SOURCE_FILES main.cpp dns.cpp ui.cpp)
 add_executable(oksirc ${SOURCE_FILES})
 
 target_link_libraries(oksirc ${NSPR_LIBRARIES} ${NSS_LIBRARIES} Qt5::Widgets)

main.cpp

@@ -1,10 +1,12 @@
 #include <iostream>
 #include "dns.h"
 
+
 // NSPR include files
 #include <prerror.h>
 #include <prinit.h>
 #include <prnetdb.h>
+#include <prthread.h>
 #include <nspr.h>
 
 // NSS include files
@@ -15,9 +17,8 @@
 #include <sslproto.h>
 #include <prio.h>
 
-// Qt Include Files, should come after NSPR / NSS
+// Qt-dependent Include Files, should come after NSPR / NSS
-#include <QtWidgets>
+#include "ui.h"
-#include <QPlainTextEdit>
 
 NSSInitContext *nssContext;
 SECMODModule *builtInRootsMod;
@@ -86,6 +87,7 @@ void init() {
 	}
 }
 
+
 int main(int argc, char *argv[]) {
 	init();
 
@@ -107,33 +109,16 @@ int main(int argc, char* argv[]) {
 	PRFileDesc *nssSocket;
 	SSL_ImportFD(NULL, tcpSocket);
 
-   QApplication app(argc, argv);
-   QWidget mainWindow;
-   mainWindow.resize(1280, 720);
-   mainWindow.setWindowTitle("oksirc - early Qt test");
 
-   QPlainTextEdit *mainLog = new QPlainTextEdit();
-   mainLog->setReadOnly(true);
-   QLineEdit *textEntry = new QLineEdit();
-   QPushButton *sendButton = new QPushButton(QApplication::translate("send", "Send"));
 
-   QHBoxLayout *entryLineLayout = new QHBoxLayout();
+	ui *uiInstance = new ui(argc, argv);
-   entryLineLayout->addWidget(textEntry);
+	int qAppRetCode = uiInstance->exec();
-   entryLineLayout->addWidget(sendButton);
-
-   QVBoxLayout *mainLogAndLineLayout = new QVBoxLayout();
-   mainLogAndLineLayout->addWidget(mainLog);
-   mainLogAndLineLayout->addLayout(entryLineLayout);
-   mainWindow.setLayout(mainLogAndLineLayout);
-   mainWindow.show();
-   textEntry->setFocus();
 
 	char messageBuf[1024];
 	sprintf(messageBuf, "Found IP Address: %s", ipString);
-   mainLog->appendPlainText(messageBuf);
+	uiInstance->mainLog->appendPlainText(messageBuf);
-
 	SECMOD_DestroyModule(builtInRootsMod);
 	NSS_ShutdownContext(nssContext);
 
-   return app.exec();
+	return qAppRetCode;
 }

ui.cpp

@@ -0,0 +1,35 @@
+#include "ui.h"
+
+ui::ui(int argc, char **argv) {
+	app = new QApplication(argc, argv);
+	mainWindow = new QWidget();
+	mainWindow->resize(1280, 720);
+	mainWindow->setWindowTitle("oksirc - early Qt test");
+
+	mainLog = new QPlainTextEdit();
+	mainLog->setReadOnly(true);
+	textEntry = new QLineEdit();
+	QPushButton *sendButton = new QPushButton(QApplication::translate("send", "Send"));
+	QObject::connect(sendButton, &QPushButton::clicked, this, &ui::sendButtonClicked);
+
+	QHBoxLayout *entryLineLayout = new QHBoxLayout();
+	entryLineLayout->addWidget(textEntry);
+	entryLineLayout->addWidget(sendButton);
+
+	QVBoxLayout *mainLogAndLineLayout = new QVBoxLayout();
+	mainLogAndLineLayout->addWidget(mainLog);
+	mainLogAndLineLayout->addLayout(entryLineLayout);
+	mainWindow->setLayout(mainLogAndLineLayout);
+	mainWindow->show();
+	textEntry->setFocus();
+}
+
+int ui::exec() {
+	return app->exec();
+}
+
+void ui::sendButtonClicked(bool checked) {
+	this->mainLog->appendPlainText("Send button clicked!");
+	this->mainLog->appendPlainText(textEntry->text());
+	textEntry->clear();
+}

ui.h

@@ -0,0 +1,24 @@
+#ifndef OKSIRC_UI_H
+#define OKSIRC_UI_H
+
+#include <QtWidgets>
+
+class ui : public QObject {
+public:
+	ui(int, char **);
+
+	int exec();
+	void sendButtonClicked(bool);
+
+
+	QPlainTextEdit *mainLog;
+
+private:
+	QApplication *app;
+	QWidget *mainWindow;
+	QLineEdit *textEntry;
+
+};
+
+
+#endif //OKSIRC_UI_H