diff --git a/Decryption.cpp b/Decryption.cpp index 63cd338..03b0ee0 100644 --- a/Decryption.cpp +++ b/Decryption.cpp @@ -15,6 +15,10 @@ Decryption::Decryption(const std::string& message) } +void Decryption::setDecryptedMessage(const std::string& message) +{ + this->decryptedMessage = message; +} void Decryption::decryptMessage() { GenerateKeys gk; @@ -25,9 +29,7 @@ void Decryption::decryptMessage() while(!ioEvent.eof()) { - char whiteSpace = static_cast(32); - //std::cout << "Am I stuck?" << std::endl; - getline(ioEvent, messageToBeDecrypted, whiteSpace); + ioEvent >> messageToBeDecrypted; } ioEvent.close(); @@ -50,20 +52,21 @@ void Decryption::decryptMessage() otherElements[2] = {' '}; number = atoi(otherElements); decryptedMessage += gk.decryptedCharacters[number]; - //decryptedMessage.append(gk.decryptedCharacters[number]); - //newWord += characters[number]; index += 1; - } else { decryptedMessage += gk.decryptedCharacters[number]; - //decryptedMessage.append(gk.decryptedCharacters[number]); - //newWord += characters[number]; index += 2; - } } } - setMessage(decryptedMessage); + setDecryptedMessage(decryptedMessage); } + + +std::string Decryption::getDecryptedMessage() const +{ + + return decryptedMessage; +} diff --git a/Decryption.h b/Decryption.h index b31e4a6..d088d57 100644 --- a/Decryption.h +++ b/Decryption.h @@ -13,9 +13,13 @@ public: Decryption(); Decryption(const std::string&); + void setDecryptedMessage(const std::string&); void decryptMessage(); + std::string getDecryptedMessage() const; + private: + std::string decryptedMessage; }; #endif diff --git a/Makefile b/Makefile index c92d560..75913f2 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ ############################################################################# # Makefile for building: EncryptedMessaging -# Generated by qmake (3.1) (Qt 5.8.0) +# Generated by qmake (3.0) (Qt 5.6.1) # Project: EncryptedMessaging.pro # Template: app -# Command: /usr/bin/qmake -o Makefile EncryptedMessaging.pro +# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile EncryptedMessaging.pro ############################################################################# MAKEFILE = Makefile @@ -13,10 +13,10 @@ MAKEFILE = Makefile CC = gcc CXX = g++ DEFINES = -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I. -I. -isystem /usr/include/qt -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtCore -I. -isystem /usr/include/libdrm -I/usr/lib/qt/mkspecs/linux-g++ -QMAKE = /usr/bin/qmake +CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) +CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) +INCPATH = -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 +QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake DEL_FILE = rm -f CHK_DIR_EXISTS= test -d MKDIR = mkdir -p @@ -35,8 +35,8 @@ COMPRESS = gzip -9f DISTNAME = EncryptedMessaging1.0.0 DISTDIR = /home/monde/Programming/Qt/EncryptedMessaging/.tmp/EncryptedMessaging1.0.0 LINK = g++ -LFLAGS = -Wl,-O1 -Wl,-O1,--sort-common,--as-needed,-z,relro -LIBS = $(SUBLIBS) -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread +LFLAGS = -m64 -Wl,-O1 +LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -L/usr/lib/x86_64-linux-gnu -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread AR = ar cqs RANLIB = SED = sed @@ -65,111 +65,64 @@ OBJECTS = Decryption.o \ MessagingControls.o \ moc_MessagingControls.o \ moc_KeyManagementWindow.o -DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ - /usr/lib/qt/mkspecs/common/unix.conf \ - /usr/lib/qt/mkspecs/common/linux.conf \ - /usr/lib/qt/mkspecs/common/sanitize.conf \ - /usr/lib/qt/mkspecs/common/gcc-base.conf \ - /usr/lib/qt/mkspecs/common/gcc-base-unix.conf \ - /usr/lib/qt/mkspecs/common/g++-base.conf \ - /usr/lib/qt/mkspecs/common/g++-unix.conf \ - /usr/lib/qt/mkspecs/qconfig.pri \ - /usr/lib/qt/mkspecs/modules/qt_KAuth.pri \ - /usr/lib/qt/mkspecs/modules/qt_KCoreAddons.pri \ - /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_accessibility_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_core.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_core_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_dbus.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_dbus_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_egl_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_fb_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_glx_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_gui.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_input_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_location.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_network.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_packetprotocol_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_positioning.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_positioning_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qml.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_sensors.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_sensors_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_service_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_sql.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_svg.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_svg_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_testlib.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_theme_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_widgets.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_x11extras.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xml.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /usr/lib/qt/mkspecs/features/qt_functions.prf \ - /usr/lib/qt/mkspecs/features/qt_config.prf \ - /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ - /usr/lib/qt/mkspecs/features/spec_post.prf \ +DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \ .qmake.stash \ - /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ - /usr/lib/qt/mkspecs/features/toolchain.prf \ - /usr/lib/qt/mkspecs/features/default_pre.prf \ - /usr/lib/qt/mkspecs/features/resolve_config.prf \ - /usr/lib/qt/mkspecs/features/default_post.prf \ - /usr/lib/qt/mkspecs/features/warn_on.prf \ - /usr/lib/qt/mkspecs/features/qt.prf \ - /usr/lib/qt/mkspecs/features/resources.prf \ - /usr/lib/qt/mkspecs/features/moc.prf \ - /usr/lib/qt/mkspecs/features/unix/opengl.prf \ - /usr/lib/qt/mkspecs/features/uic.prf \ - /usr/lib/qt/mkspecs/features/unix/thread.prf \ - /usr/lib/qt/mkspecs/features/qmake_use.prf \ - /usr/lib/qt/mkspecs/features/file_copies.prf \ - /usr/lib/qt/mkspecs/features/testcase_targets.prf \ - /usr/lib/qt/mkspecs/features/exceptions.prf \ - /usr/lib/qt/mkspecs/features/yacc.prf \ - /usr/lib/qt/mkspecs/features/lex.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \ EncryptedMessaging.pro Decryption.h \ Encryption.h \ GenerateKeys.h \ @@ -193,225 +146,131 @@ first: all $(TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) -Makefile: EncryptedMessaging.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt/mkspecs/features/spec_pre.prf \ - /usr/lib/qt/mkspecs/common/unix.conf \ - /usr/lib/qt/mkspecs/common/linux.conf \ - /usr/lib/qt/mkspecs/common/sanitize.conf \ - /usr/lib/qt/mkspecs/common/gcc-base.conf \ - /usr/lib/qt/mkspecs/common/gcc-base-unix.conf \ - /usr/lib/qt/mkspecs/common/g++-base.conf \ - /usr/lib/qt/mkspecs/common/g++-unix.conf \ - /usr/lib/qt/mkspecs/qconfig.pri \ - /usr/lib/qt/mkspecs/modules/qt_KAuth.pri \ - /usr/lib/qt/mkspecs/modules/qt_KCoreAddons.pri \ - /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_accessibility_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_core.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_core_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_dbus.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_dbus_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_egl_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_fb_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_glx_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_gui.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_input_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_location.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_network.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_packetprotocol_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_positioning.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_positioning_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qml.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_sensors.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_sensors_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_service_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_sql.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_svg.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_svg_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_testlib.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_theme_support_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_widgets.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_x11extras.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xml.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /usr/lib/qt/mkspecs/features/qt_functions.prf \ - /usr/lib/qt/mkspecs/features/qt_config.prf \ - /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ - /usr/lib/qt/mkspecs/features/spec_post.prf \ +Makefile: EncryptedMessaging.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \ .qmake.stash \ - /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ - /usr/lib/qt/mkspecs/features/toolchain.prf \ - /usr/lib/qt/mkspecs/features/default_pre.prf \ - /usr/lib/qt/mkspecs/features/resolve_config.prf \ - /usr/lib/qt/mkspecs/features/default_post.prf \ - /usr/lib/qt/mkspecs/features/warn_on.prf \ - /usr/lib/qt/mkspecs/features/qt.prf \ - /usr/lib/qt/mkspecs/features/resources.prf \ - /usr/lib/qt/mkspecs/features/moc.prf \ - /usr/lib/qt/mkspecs/features/unix/opengl.prf \ - /usr/lib/qt/mkspecs/features/uic.prf \ - /usr/lib/qt/mkspecs/features/unix/thread.prf \ - /usr/lib/qt/mkspecs/features/qmake_use.prf \ - /usr/lib/qt/mkspecs/features/file_copies.prf \ - /usr/lib/qt/mkspecs/features/testcase_targets.prf \ - /usr/lib/qt/mkspecs/features/exceptions.prf \ - /usr/lib/qt/mkspecs/features/yacc.prf \ - /usr/lib/qt/mkspecs/features/lex.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \ EncryptedMessaging.pro \ - /usr/lib/libQt5Widgets.prl \ - /usr/lib/libQt5Gui.prl \ - /usr/lib/libQt5Core.prl + /usr/lib/x86_64-linux-gnu/libQt5Widgets.prl \ + /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \ + /usr/lib/x86_64-linux-gnu/libQt5Core.prl $(QMAKE) -o Makefile EncryptedMessaging.pro -/usr/lib/qt/mkspecs/features/spec_pre.prf: -/usr/lib/qt/mkspecs/common/unix.conf: -/usr/lib/qt/mkspecs/common/linux.conf: -/usr/lib/qt/mkspecs/common/sanitize.conf: -/usr/lib/qt/mkspecs/common/gcc-base.conf: -/usr/lib/qt/mkspecs/common/gcc-base-unix.conf: -/usr/lib/qt/mkspecs/common/g++-base.conf: -/usr/lib/qt/mkspecs/common/g++-unix.conf: -/usr/lib/qt/mkspecs/qconfig.pri: -/usr/lib/qt/mkspecs/modules/qt_KAuth.pri: -/usr/lib/qt/mkspecs/modules/qt_KCoreAddons.pri: -/usr/lib/qt/mkspecs/modules/qt_KItemModels.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_accessibility_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_concurrent_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_core.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_core_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_dbus.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_dbus_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_devicediscovery_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_egl_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_fb_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_fontdatabase_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_glx_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_gui.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_gui_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_input_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_location.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_network.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_openglextensions_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_packetprotocol_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_platformcompositor_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_positioning.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_positioning_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_printsupport.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_printsupport_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_qml.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_quick.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_sensors.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_sensors_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_service_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_sql.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_sql_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_svg.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_svg_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_testlib.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_testlib_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_theme_support_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_widgets.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_widgets_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_x11extras.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_xml.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_xml_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns_private.pri: -/usr/lib/qt/mkspecs/features/qt_functions.prf: -/usr/lib/qt/mkspecs/features/qt_config.prf: -/usr/lib/qt/mkspecs/linux-g++/qmake.conf: -/usr/lib/qt/mkspecs/features/spec_post.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/sanitize.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf: .qmake.stash: -/usr/lib/qt/mkspecs/features/exclusive_builds.prf: -/usr/lib/qt/mkspecs/features/toolchain.prf: -/usr/lib/qt/mkspecs/features/default_pre.prf: -/usr/lib/qt/mkspecs/features/resolve_config.prf: -/usr/lib/qt/mkspecs/features/default_post.prf: -/usr/lib/qt/mkspecs/features/warn_on.prf: -/usr/lib/qt/mkspecs/features/qt.prf: -/usr/lib/qt/mkspecs/features/resources.prf: -/usr/lib/qt/mkspecs/features/moc.prf: -/usr/lib/qt/mkspecs/features/unix/opengl.prf: -/usr/lib/qt/mkspecs/features/uic.prf: -/usr/lib/qt/mkspecs/features/unix/thread.prf: -/usr/lib/qt/mkspecs/features/qmake_use.prf: -/usr/lib/qt/mkspecs/features/file_copies.prf: -/usr/lib/qt/mkspecs/features/testcase_targets.prf: -/usr/lib/qt/mkspecs/features/exceptions.prf: -/usr/lib/qt/mkspecs/features/yacc.prf: -/usr/lib/qt/mkspecs/features/lex.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/file_copies.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf: EncryptedMessaging.pro: -/usr/lib/libQt5Widgets.prl: -/usr/lib/libQt5Gui.prl: -/usr/lib/libQt5Core.prl: +/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl: +/usr/lib/x86_64-linux-gnu/libQt5Gui.prl: +/usr/lib/x86_64-linux-gnu/libQt5Core.prl: qmake: FORCE @$(QMAKE) -o Makefile EncryptedMessaging.pro @@ -426,7 +285,6 @@ dist: distdir FORCE distdir: FORCE @test -d $(DISTDIR) || mkdir -p $(DISTDIR) $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ - $(COPY_FILE) --parents /usr/lib/qt/mkspecs/features/data/dummy.cpp $(DISTDIR)/ $(COPY_FILE) --parents Decryption.h Encryption.h GenerateKeys.h MessagingControls.h Cryption.h KeyManagementWindow.h $(DISTDIR)/ $(COPY_FILE) --parents Decryption.cpp Encryption.cpp Cryption.cpp KeyManagementWindow.cpp GenerateKeys.cpp Main.cpp MessagingControls.cpp $(DISTDIR)/ @@ -454,24 +312,14 @@ benchmark: first compiler_rcc_make_all: compiler_rcc_clean: -compiler_moc_predefs_make_all: moc_predefs.h -compiler_moc_predefs_clean: - -$(DEL_FILE) moc_predefs.h -moc_predefs.h: /usr/lib/qt/mkspecs/features/data/dummy.cpp - g++ -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -Wall -W -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp - compiler_moc_header_make_all: moc_MessagingControls.cpp moc_KeyManagementWindow.cpp compiler_moc_header_clean: -$(DEL_FILE) moc_MessagingControls.cpp moc_KeyManagementWindow.cpp -moc_MessagingControls.cpp: MessagingControls.h \ - moc_predefs.h \ - /usr/bin/moc - /usr/bin/moc $(DEFINES) --include ./moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/monde/Programming/Qt/EncryptedMessaging -I/home/monde/Programming/Qt/EncryptedMessaging -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtCore -I/usr/include/c++/6.3.1 -I/usr/include/c++/6.3.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.3.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include-fixed -I/usr/include MessagingControls.h -o moc_MessagingControls.cpp +moc_MessagingControls.cpp: MessagingControls.h + /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I/home/monde/Programming/Qt/EncryptedMessaging -I/home/monde/Programming/Qt/EncryptedMessaging -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/6.3.1 -I/usr/include/c++/6.3.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.3.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include-fixed -I/usr/include MessagingControls.h -o moc_MessagingControls.cpp -moc_KeyManagementWindow.cpp: KeyManagementWindow.h \ - moc_predefs.h \ - /usr/bin/moc - /usr/bin/moc $(DEFINES) --include ./moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/monde/Programming/Qt/EncryptedMessaging -I/home/monde/Programming/Qt/EncryptedMessaging -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtCore -I/usr/include/c++/6.3.1 -I/usr/include/c++/6.3.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.3.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include-fixed -I/usr/include KeyManagementWindow.h -o moc_KeyManagementWindow.cpp +moc_KeyManagementWindow.cpp: KeyManagementWindow.h + /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I/home/monde/Programming/Qt/EncryptedMessaging -I/home/monde/Programming/Qt/EncryptedMessaging -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/6.3.1 -I/usr/include/c++/6.3.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.3.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include-fixed -I/usr/include KeyManagementWindow.h -o moc_KeyManagementWindow.cpp compiler_moc_source_make_all: compiler_moc_source_clean: @@ -483,7 +331,7 @@ compiler_yacc_impl_make_all: compiler_yacc_impl_clean: compiler_lex_make_all: compiler_lex_clean: -compiler_clean: compiler_moc_predefs_clean compiler_moc_header_clean +compiler_clean: compiler_moc_header_clean ####### Compile @@ -500,7 +348,8 @@ Encryption.o: Encryption.cpp Encryption.h \ Cryption.o: Cryption.cpp Cryption.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Cryption.o Cryption.cpp -KeyManagementWindow.o: KeyManagementWindow.cpp KeyManagementWindow.h +KeyManagementWindow.o: KeyManagementWindow.cpp KeyManagementWindow.h \ + GenerateKeys.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o KeyManagementWindow.o KeyManagementWindow.cpp GenerateKeys.o: GenerateKeys.cpp GenerateKeys.h @@ -509,7 +358,10 @@ GenerateKeys.o: GenerateKeys.cpp GenerateKeys.h Main.o: Main.cpp MessagingControls.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Main.o Main.cpp -MessagingControls.o: MessagingControls.cpp MessagingControls.h +MessagingControls.o: MessagingControls.cpp MessagingControls.h \ + KeyManagementWindow.h \ + Encryption.h \ + Cryption.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MessagingControls.o MessagingControls.cpp moc_MessagingControls.o: moc_MessagingControls.cpp diff --git a/MessagingControls.cpp b/MessagingControls.cpp index 4c2207c..7772f9b 100644 --- a/MessagingControls.cpp +++ b/MessagingControls.cpp @@ -1,16 +1,19 @@ #include #include +#include #include #include "MessagingControls.h" #include "KeyManagementWindow.h" #include "Encryption.h" +#include"Decryption.h" MessagingControls::MessagingControls() { /** * Initialize controls */ + textForCryption = new QTextEdit; cryptionChoice = true; setupMainWindow(); @@ -29,10 +32,6 @@ MessagingControls::~MessagingControls() void MessagingControls::setupMainWindow() { - textForCryption = new QTextEdit; - textForCryption->setText("sdfs"); - textForCryption->clear(); - cryptionButon = new QPushButton(tr("XO")); cryptionSwitch = new QPushButton(tr("encrypt chosen")); @@ -70,8 +69,11 @@ void MessagingControls::createMenus() fileMenu = menuBar()->addMenu(tr("File")); editMenu = menuBar()->addMenu(tr("Edit")); - closeApplication = new QAction(tr("Quit Application")); - keyEdit = new QAction(tr("Key Edit")); + closeApplication = new QAction(new QObject(nullptr)); + closeApplication->setText("Exit Application"); + + keyEdit = new QAction(new QObject(nullptr)); + keyEdit->setText("Key Management"); fileMenu->addAction(closeApplication); @@ -96,44 +98,47 @@ void MessagingControls::determineCryption() { if (cryptionChoice) { - QString content; - content = textForCryption->toPlainText(); - std::string message = content.toStdString(); - Encryption ec; - ec.setMessage(message); + ec.setMessage(grabCryptionText()); ec.encryptMessage(); - std::cout << ec.getEncryptedMessage() << std::endl; - QString messageQ = QString::fromStdString(ec.getEncryptedMessage()); textForCryption->clear(); - textForCryption->setText(messageQ); + textForCryption->setText(QString::fromStdString(ec.getEncryptedMessage())); cryptionSwitch->setText("decrypt chosen"); cryptionChoice = false; /** - * Decrypt Message + * Encrypt Message */ } else { + Decryption dc; + dc.setMessage(grabCryptionText()); + dc.decryptMessage(); + + textForCryption->clear(); + textForCryption->setText(QString::fromStdString(dc.getDecryptedMessage())); + + cryptionSwitch->setText("encrypt chosen"); + cryptionChoice = true; /** - * Encrypt Message + * Decrypt Message */ } - //std::string s; - //s = textForCryption->toPlainText().toStdString(); - //std::cout << s << std::endl; - //QString* str = textForCryption->toPlainText(); - //s = str->toStdString(); - //s = static_cast(textForCryption->toPlainText()); - //std::cout << textForCryption->toPlainText() << std::endl; - } void MessagingControls::keyManagementWindow() { KeyManagementWindow* kh = new KeyManagementWindow; kh->show(); - } + + +std::string MessagingControls::grabCryptionText() +{ + QString placeHolder = textForCryption->toPlainText(); + std::string message = placeHolder.toStdString(); + + return message; +} diff --git a/MessagingControls.h b/MessagingControls.h index e81a9d0..915c742 100644 --- a/MessagingControls.h +++ b/MessagingControls.h @@ -13,6 +13,7 @@ #include #include #include +#include class QLabel; class QLineEdit; @@ -22,6 +23,7 @@ class QMenuBar; class QMainWindow; class QMenu; class QAction; +class QString; class MessagingControls : public QMainWindow { @@ -41,7 +43,6 @@ private slots: private: void setupMainWindow(); void createMenus(); - QVBoxLayout* buttonLayout; QWidget* buttonWidget; @@ -63,6 +64,9 @@ private: QAction* closeApplication; QAction* keyEdit; + + std::string grabCryptionText(); + unsigned short mainWindowHeight = 450; unsigned short mainWindowWidth = 550;