From 03118b9a9c805db3899799fdaa0b28ba02470961 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Tue, 7 Jan 2014 03:50:11 +0000 Subject: [PATCH] git-svn-id: svn://imanolbarba.net/PAD@51 c2ee353e-ed0d-4329-bf56-03aec153487f --- QChatClient/QChatClient.pro.user | 198 ++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- QChatClient/chatroom.cpp | 1 - build-QChatClient-Desktop-Debug/Makefile | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- build-QChatClient-Desktop-Debug/QChatClient | Bin 1893140 -> 0 bytes build-QChatClient-Desktop-Debug/Socket.o | Bin 98440 -> 0 bytes build-QChatClient-Desktop-Debug/chatwidget.o | Bin 275808 -> 0 bytes build-QChatClient-Desktop-Debug/chatwindow.o | Bin 602640 -> 0 bytes build-QChatClient-Desktop-Debug/loginscreen.o | Bin 546464 -> 0 bytes build-QChatClient-Desktop-Debug/main.o | Bin 239728 -> 0 bytes build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_chatroom.cpp | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- build-QChatClient-Desktop-Debug/moc_chatroom.o | Bin 438336 -> 0 bytes build-QChatClient-Desktop-Debug/moc_chatwidget.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_chatwidget.o | Bin 271904 -> 0 bytes build-QChatClient-Desktop-Debug/moc_chatwindow.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_chatwindow.o | Bin 290048 -> 0 bytes build-QChatClient-Desktop-Debug/moc_loginscreen.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_loginscreen.o | Bin 281096 -> 0 bytes build-QChatClient-Desktop-Debug/ui_chatroom.h | 2 +- build-QChatClient-Desktop-Debug/ui_chatwindow.h | 2 +- build-QChatClient-Desktop-Debug/ui_loginscreen.h | 2 +- 21 files changed, 136 insertions(+), 473 deletions(-) diff --git a/QChatClient/QChatClient.pro.user b/QChatClient/QChatClient.pro.user index 6e8e9b3..a340e20 100644 --- a/QChatClient/QChatClient.pro.user +++ b/QChatClient/QChatClient.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -189,200 +189,6 @@ ProjectExplorer.DefaultDeployConfiguration 1 - - - true - - false - false - false - false - true - 0.01 - 10 - true - 25 - - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - QChatClient - - Qt4ProjectManager.Qt4RunConfiguration:/home/imanol/devel/eclipse/PAD/QChatClient/QChatClient.pro - 2 - - QChatClient.pro - false - false - - - 3768 - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop-qt4 - Desktop-qt4 - {09071c90-33f0-49f1-8c3d-15bcbd81cbe2} - 1 - 0 - 0 - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /home/imanol/devel/eclipse/PAD/build-QChatClient-Desktop_qt4-Debug - true - - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /home/imanol/devel/eclipse/PAD/build-QChatClient-Desktop_qt4-Release - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - true @@ -436,7 +242,7 @@ ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.EnvironmentId diff --git a/QChatClient/chatroom.cpp b/QChatClient/chatroom.cpp index 4ac923c..2e546bb 100644 --- a/QChatClient/chatroom.cpp +++ b/QChatClient/chatroom.cpp @@ -204,7 +204,6 @@ QString Chatroom::getNickname() void Chatroom::updateUserList(QString userlist) { - ui->userList->clearSelection(); ui->userList->clear(); QStringList users = userlist.split('\n',QString::SkipEmptyParts); for(int i = 0; i < users.size(); i++) diff --git a/build-QChatClient-Desktop-Debug/Makefile b/build-QChatClient-Desktop-Debug/Makefile index b1fc16f..9e5c122 100644 --- a/build-QChatClient-Desktop-Debug/Makefile +++ b/build-QChatClient-Desktop-Debug/Makefile @@ -1,9 +1,9 @@ ############################################################################# # Makefile for building: QChatClient -# Generated by qmake (3.0) (Qt 5.0.2) on: vie dic 27 14:11:32 2013 +# Generated by qmake (3.0) (Qt 5.0.1) on: mar ene 7 05:02:24 2014 # Project: ../QChatClient/QChatClient.pro # Template: app -# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro +# Command: /usr/lib/i386-linux-gnu/qt5/bin/qmake -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro ############################################################################# MAKEFILE = Makefile @@ -13,15 +13,15 @@ MAKEFILE = Makefile CC = gcc CXX = g++ DEFINES = -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -m64 -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) -CXXFLAGS = -m64 -pipe -std=c++11 -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) -INCPATH = -I/usr/share/qt5/mkspecs/linux-g++-64 -I../QChatClient -I/usr/include/qt5 -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -I. -I. -I. +CFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) +CXXFLAGS = -pipe -std=c++11 -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) +INCPATH = -I/usr/share/qt5/mkspecs/linux-g++ -I../QChatClient -I/usr/include/qt5 -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -I. -I. -I. LINK = g++ -LFLAGS = -m64 -LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lQt5Widgets -L/usr/lib/x86_64-linux-gnu -lQt5Gui -lQt5Core -lGL -lpthread +LFLAGS = +LIBS = $(SUBLIBS) -lQt5Widgets -L/usr/lib/i386-linux-gnu -lQt5Gui -lQt5Core -lGL -lpthread AR = ar cqs RANLIB = -QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake +QMAKE = /usr/lib/i386-linux-gnu/qt5/bin/qmake TAR = tar -cf COMPRESS = gzip -9f COPY = cp -f @@ -86,19 +86,25 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \ /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qml.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_quick.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ /usr/share/qt5/mkspecs/features/qt_functions.prf \ /usr/share/qt5/mkspecs/features/qt_config.prf \ - /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf \ + /usr/share/qt5/mkspecs/linux-g++/qmake.conf \ /usr/share/qt5/mkspecs/features/spec_post.prf \ /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ /usr/share/qt5/mkspecs/features/default_pre.prf \ /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ - /usr/share/qt5/mkspecs/features/resolve_config.prf \ + /usr/share/qt5/mkspecs/features/debug.prf \ /usr/share/qt5/mkspecs/features/default_post.prf \ + /usr/share/qt5/mkspecs/features/shared.prf \ /usr/share/qt5/mkspecs/features/qml_debug.prf \ /usr/share/qt5/mkspecs/features/declarative_debug.prf \ /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ @@ -149,7 +155,7 @@ $(TARGET): ui_chatwindow.h ui_loginscreen.h ui_chatroom.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) { test -n "$(DESTDIR)" && DESTDIR="$(DESTDIR)" || DESTDIR=.; } && test $$(gdb --version | sed -e 's,[^0-9]\+\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index $$DESTDIR" -ex quit '$(TARGET)' && test -f $(TARGET).gdb-index && objcopy --add-section '.gdb_index=$(TARGET).gdb-index' --set-section-flags '.gdb_index=readonly' '$(TARGET)' '$(TARGET)' && rm -f $(TARGET).gdb-index || true -Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf /usr/share/qt5/mkspecs/features/spec_pre.prf \ +Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++/qmake.conf /usr/share/qt5/mkspecs/features/spec_pre.prf \ /usr/share/qt5/mkspecs/common/shell-unix.conf \ /usr/share/qt5/mkspecs/common/unix.conf \ /usr/share/qt5/mkspecs/common/linux.conf \ @@ -167,19 +173,25 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qml.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_quick.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ /usr/share/qt5/mkspecs/features/qt_functions.prf \ /usr/share/qt5/mkspecs/features/qt_config.prf \ - /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf \ + /usr/share/qt5/mkspecs/linux-g++/qmake.conf \ /usr/share/qt5/mkspecs/features/spec_post.prf \ /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ /usr/share/qt5/mkspecs/features/default_pre.prf \ /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ - /usr/share/qt5/mkspecs/features/resolve_config.prf \ + /usr/share/qt5/mkspecs/features/debug.prf \ /usr/share/qt5/mkspecs/features/default_post.prf \ + /usr/share/qt5/mkspecs/features/shared.prf \ /usr/share/qt5/mkspecs/features/qml_debug.prf \ /usr/share/qt5/mkspecs/features/declarative_debug.prf \ /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ @@ -196,10 +208,10 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma /usr/share/qt5/mkspecs/features/yacc.prf \ /usr/share/qt5/mkspecs/features/lex.prf \ ../QChatClient/QChatClient.pro \ - /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) -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro + /usr/lib/i386-linux-gnu/libQt5Widgets.prl \ + /usr/lib/i386-linux-gnu/libQt5Gui.prl \ + /usr/lib/i386-linux-gnu/libQt5Core.prl + $(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/features/spec_pre.prf: /usr/share/qt5/mkspecs/common/shell-unix.conf: /usr/share/qt5/mkspecs/common/unix.conf: @@ -218,19 +230,25 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri: /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri: /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_qml.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_quick.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri: /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri: /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri: /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri: /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri: /usr/share/qt5/mkspecs/features/qt_functions.prf: /usr/share/qt5/mkspecs/features/qt_config.prf: -/usr/share/qt5/mkspecs/linux-g++-64/qmake.conf: +/usr/share/qt5/mkspecs/linux-g++/qmake.conf: /usr/share/qt5/mkspecs/features/spec_post.prf: /usr/share/qt5/mkspecs/features/exclusive_builds.prf: /usr/share/qt5/mkspecs/features/default_pre.prf: /usr/share/qt5/mkspecs/features/unix/default_pre.prf: -/usr/share/qt5/mkspecs/features/resolve_config.prf: +/usr/share/qt5/mkspecs/features/debug.prf: /usr/share/qt5/mkspecs/features/default_post.prf: +/usr/share/qt5/mkspecs/features/shared.prf: /usr/share/qt5/mkspecs/features/qml_debug.prf: /usr/share/qt5/mkspecs/features/declarative_debug.prf: /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf: @@ -247,16 +265,16 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma /usr/share/qt5/mkspecs/features/yacc.prf: /usr/share/qt5/mkspecs/features/lex.prf: ../QChatClient/QChatClient.pro: -/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl: -/usr/lib/x86_64-linux-gnu/libQt5Gui.prl: -/usr/lib/x86_64-linux-gnu/libQt5Core.prl: +/usr/lib/i386-linux-gnu/libQt5Widgets.prl: +/usr/lib/i386-linux-gnu/libQt5Gui.prl: +/usr/lib/i386-linux-gnu/libQt5Core.prl: qmake: FORCE - @$(QMAKE) -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro + @$(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro qmake_all: FORCE dist: - @test -d .tmp/QChatClient1.0.0 || mkdir -p .tmp/QChatClient1.0.0 + @test -d .tmp/QChatClient1.0.0 || $(MKDIR) .tmp/QChatClient1.0.0 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/loginscreen.h ../QChatClient/chatroom.h ../QChatClient/SocketException.h ../QChatClient/Socket.h ../QChatClient/chatwidget.h ../QChatClient/chatwindow.h ../QChatClient/chatinputtext.h .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/main.cpp ../QChatClient/loginscreen.cpp ../QChatClient/chatroom.cpp ../QChatClient/Socket.cpp ../QChatClient/chatwidget.cpp ../QChatClient/chatwindow.cpp ../QChatClient/chatinputtext.cpp .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/chatwindow.ui ../QChatClient/loginscreen.ui ../QChatClient/chatroom.ui .tmp/QChatClient1.0.0/ && (cd `dirname .tmp/QChatClient1.0.0` && $(TAR) QChatClient1.0.0.tar QChatClient1.0.0 && $(COMPRESS) QChatClient1.0.0.tar) && $(MOVE) `dirname .tmp/QChatClient1.0.0`/QChatClient1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/QChatClient1.0.0 @@ -320,7 +338,6 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -408,7 +425,7 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ ../QChatClient/SocketException.h \ ../QChatClient/chatwindow.h \ ../QChatClient/loginscreen.h - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/loginscreen.h -o moc_loginscreen.cpp + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/loginscreen.h -o moc_loginscreen.cpp moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtWidgets/qmainwindow.h \ @@ -443,7 +460,6 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -531,7 +547,7 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ ../QChatClient/Socket.h \ ../QChatClient/SocketException.h \ ../QChatClient/chatroom.h - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatroom.h -o moc_chatroom.cpp + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatroom.h -o moc_chatroom.cpp moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtWidgets/qtextedit.h \ @@ -568,7 +584,6 @@ moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -656,7 +671,7 @@ moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtCore/QFile \ /usr/include/qt5/QtCore/QTextStream \ ../QChatClient/chatwidget.h - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwidget.h -o moc_chatwidget.cpp + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwidget.h -o moc_chatwidget.cpp moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtWidgets/qmainwindow.h \ @@ -691,7 +706,6 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -779,7 +793,7 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ ../QChatClient/SocketException.h \ ../QChatClient/chatwindow.h \ ../QChatClient/chatwindow.h - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwindow.h -o moc_chatwindow.cpp + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwindow.h -o moc_chatwindow.cpp moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtWidgets/qtextedit.h \ @@ -816,7 +830,6 @@ moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -898,7 +911,7 @@ moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtGui/qpen.h \ /usr/include/qt5/QtGui/QKeyEvent \ ../QChatClient/chatinputtext.h - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatinputtext.h -o moc_chatinputtext.cpp + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatinputtext.h -o moc_chatinputtext.cpp compiler_wayland-code_make_all: compiler_wayland-code_clean: @@ -945,7 +958,6 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1067,7 +1079,6 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1148,10 +1159,10 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ /usr/include/qt5/QtGui/qtextformat.h \ /usr/include/qt5/QtGui/qpen.h \ /usr/include/qt5/QtGui/QKeyEvent - /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/chatwindow.ui -o ui_chatwindow.h + /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/chatwindow.ui -o ui_chatwindow.h ui_loginscreen.h: ../QChatClient/loginscreen.ui - /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/loginscreen.ui -o ui_loginscreen.h + /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/loginscreen.ui -o ui_loginscreen.h ui_chatroom.h: ../QChatClient/chatroom.ui \ ../QChatClient/chatwidget.h \ @@ -1191,7 +1202,6 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1313,7 +1323,6 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1394,7 +1403,7 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ /usr/include/qt5/QtGui/qtextformat.h \ /usr/include/qt5/QtGui/qpen.h \ /usr/include/qt5/QtGui/QKeyEvent - /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/chatroom.ui -o ui_chatroom.h + /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/chatroom.ui -o ui_chatroom.h compiler_yacc_decl_make_all: compiler_yacc_decl_clean: @@ -1440,7 +1449,6 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1569,7 +1577,6 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1655,53 +1662,7 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ ../QChatClient/chatwindow.h \ ../QChatClient/Socket.h \ ../QChatClient/SocketException.h \ - ui_loginscreen.h \ - /usr/include/qt5/QtCore/QVariant \ - /usr/include/qt5/QtWidgets/QAction \ - /usr/include/qt5/QtWidgets/qaction.h \ - /usr/include/qt5/QtWidgets/qactiongroup.h \ - /usr/include/qt5/QtWidgets/QApplication \ - /usr/include/qt5/QtWidgets/qapplication.h \ - /usr/include/qt5/QtCore/qcoreapplication.h \ - /usr/include/qt5/QtCore/qeventloop.h \ - /usr/include/qt5/QtWidgets/qdesktopwidget.h \ - /usr/include/qt5/QtGui/qguiapplication.h \ - /usr/include/qt5/QtGui/qinputmethod.h \ - /usr/include/qt5/QtWidgets/QButtonGroup \ - /usr/include/qt5/QtWidgets/qbuttongroup.h \ - /usr/include/qt5/QtWidgets/QGridLayout \ - /usr/include/qt5/QtWidgets/qgridlayout.h \ - /usr/include/qt5/QtWidgets/qlayout.h \ - /usr/include/qt5/QtWidgets/qlayoutitem.h \ - /usr/include/qt5/QtWidgets/qboxlayout.h \ - /usr/include/qt5/QtWidgets/QHeaderView \ - /usr/include/qt5/QtWidgets/qheaderview.h \ - /usr/include/qt5/QtWidgets/qabstractitemview.h \ - /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ - /usr/include/qt5/QtWidgets/qframe.h \ - /usr/include/qt5/QtCore/qitemselectionmodel.h \ - /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ - /usr/include/qt5/QtWidgets/qstyleoption.h \ - /usr/include/qt5/QtWidgets/qabstractspinbox.h \ - /usr/include/qt5/QtGui/qvalidator.h \ - /usr/include/qt5/QtWidgets/qslider.h \ - /usr/include/qt5/QtWidgets/qabstractslider.h \ - /usr/include/qt5/QtWidgets/qstyle.h \ - /usr/include/qt5/QtWidgets/qtabbar.h \ - /usr/include/qt5/QtWidgets/qrubberband.h \ - /usr/include/qt5/QtWidgets/QLabel \ - /usr/include/qt5/QtWidgets/qlabel.h \ - /usr/include/qt5/QtWidgets/QLineEdit \ - /usr/include/qt5/QtWidgets/qlineedit.h \ - /usr/include/qt5/QtGui/qtextcursor.h \ - /usr/include/qt5/QtGui/qtextformat.h \ - /usr/include/qt5/QtGui/qpen.h \ - /usr/include/qt5/QtGui/qtextoption.h \ - /usr/include/qt5/QtWidgets/QPushButton \ - /usr/include/qt5/QtWidgets/qpushbutton.h \ - /usr/include/qt5/QtWidgets/qabstractbutton.h \ - /usr/include/qt5/QtWidgets/QSpacerItem \ - /usr/include/qt5/QtWidgets/QWidget + ui_loginscreen.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o loginscreen.o ../QChatClient/loginscreen.cpp chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ @@ -1738,7 +1699,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1824,69 +1784,7 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ ../QChatClient/Socket.h \ ../QChatClient/SocketException.h \ ../QChatClient/chatwindow.h \ - ui_chatroom.h \ - /usr/include/qt5/QtCore/QVariant \ - /usr/include/qt5/QtWidgets/QAction \ - /usr/include/qt5/QtWidgets/qaction.h \ - /usr/include/qt5/QtWidgets/qactiongroup.h \ - /usr/include/qt5/QtWidgets/QApplication \ - /usr/include/qt5/QtWidgets/qapplication.h \ - /usr/include/qt5/QtCore/qcoreapplication.h \ - /usr/include/qt5/QtCore/qeventloop.h \ - /usr/include/qt5/QtWidgets/qdesktopwidget.h \ - /usr/include/qt5/QtGui/qguiapplication.h \ - /usr/include/qt5/QtGui/qinputmethod.h \ - /usr/include/qt5/QtWidgets/QButtonGroup \ - /usr/include/qt5/QtWidgets/qbuttongroup.h \ - /usr/include/qt5/QtWidgets/QGridLayout \ - /usr/include/qt5/QtWidgets/qgridlayout.h \ - /usr/include/qt5/QtWidgets/qlayout.h \ - /usr/include/qt5/QtWidgets/qlayoutitem.h \ - /usr/include/qt5/QtWidgets/qboxlayout.h \ - /usr/include/qt5/QtWidgets/QHeaderView \ - /usr/include/qt5/QtWidgets/qheaderview.h \ - /usr/include/qt5/QtWidgets/qabstractitemview.h \ - /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ - /usr/include/qt5/QtWidgets/qframe.h \ - /usr/include/qt5/QtCore/qitemselectionmodel.h \ - /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ - /usr/include/qt5/QtWidgets/qstyleoption.h \ - /usr/include/qt5/QtWidgets/qabstractspinbox.h \ - /usr/include/qt5/QtGui/qvalidator.h \ - /usr/include/qt5/QtWidgets/qslider.h \ - /usr/include/qt5/QtWidgets/qabstractslider.h \ - /usr/include/qt5/QtWidgets/qstyle.h \ - /usr/include/qt5/QtWidgets/qtabbar.h \ - /usr/include/qt5/QtWidgets/qrubberband.h \ - /usr/include/qt5/QtWidgets/QListWidget \ - /usr/include/qt5/QtWidgets/qlistwidget.h \ - /usr/include/qt5/QtWidgets/qlistview.h \ - /usr/include/qt5/QtWidgets/QMenu \ - /usr/include/qt5/QtWidgets/qmenu.h \ - /usr/include/qt5/QtWidgets/QMenuBar \ - /usr/include/qt5/QtWidgets/qmenubar.h \ - /usr/include/qt5/QtWidgets/QPushButton \ - /usr/include/qt5/QtWidgets/qpushbutton.h \ - /usr/include/qt5/QtWidgets/qabstractbutton.h \ - /usr/include/qt5/QtWidgets/QSplitter \ - /usr/include/qt5/QtWidgets/qsplitter.h \ - /usr/include/qt5/QtWidgets/QWidget \ - ../QChatClient/chatinputtext.h \ - /usr/include/qt5/QtWidgets/QTextEdit \ - /usr/include/qt5/QtWidgets/qtextedit.h \ - /usr/include/qt5/QtGui/qtextdocument.h \ - /usr/include/qt5/QtGui/qtextoption.h \ - /usr/include/qt5/QtGui/qtextcursor.h \ - /usr/include/qt5/QtGui/qtextformat.h \ - /usr/include/qt5/QtGui/qpen.h \ - /usr/include/qt5/QtGui/QKeyEvent \ - ../QChatClient/chatwidget.h \ - /usr/include/qt5/QtWidgets/QFileDialog \ - /usr/include/qt5/QtWidgets/qfiledialog.h \ - /usr/include/qt5/QtCore/qdir.h \ - /usr/include/qt5/QtCore/qfileinfo.h \ - /usr/include/qt5/QtCore/QFile \ - /usr/include/qt5/QtCore/QTextStream + ui_chatroom.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chatroom.o ../QChatClient/chatroom.cpp Socket.o: ../QChatClient/Socket.cpp ../QChatClient/Socket.h \ @@ -1929,7 +1827,6 @@ chatwidget.o: ../QChatClient/chatwidget.cpp ../QChatClient/chatwidget.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -2052,7 +1949,6 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -2138,67 +2034,7 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ /usr/include/qt5/QtCore/QRegExp \ ../QChatClient/Socket.h \ ../QChatClient/SocketException.h \ - ui_chatwindow.h \ - /usr/include/qt5/QtCore/QVariant \ - /usr/include/qt5/QtWidgets/QAction \ - /usr/include/qt5/QtWidgets/qaction.h \ - /usr/include/qt5/QtWidgets/qactiongroup.h \ - /usr/include/qt5/QtWidgets/QApplication \ - /usr/include/qt5/QtWidgets/qapplication.h \ - /usr/include/qt5/QtCore/qcoreapplication.h \ - /usr/include/qt5/QtCore/qeventloop.h \ - /usr/include/qt5/QtWidgets/qdesktopwidget.h \ - /usr/include/qt5/QtGui/qguiapplication.h \ - /usr/include/qt5/QtGui/qinputmethod.h \ - /usr/include/qt5/QtWidgets/QButtonGroup \ - /usr/include/qt5/QtWidgets/qbuttongroup.h \ - /usr/include/qt5/QtWidgets/QGridLayout \ - /usr/include/qt5/QtWidgets/qgridlayout.h \ - /usr/include/qt5/QtWidgets/qlayout.h \ - /usr/include/qt5/QtWidgets/qlayoutitem.h \ - /usr/include/qt5/QtWidgets/qboxlayout.h \ - /usr/include/qt5/QtWidgets/QHeaderView \ - /usr/include/qt5/QtWidgets/qheaderview.h \ - /usr/include/qt5/QtWidgets/qabstractitemview.h \ - /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ - /usr/include/qt5/QtWidgets/qframe.h \ - /usr/include/qt5/QtCore/qitemselectionmodel.h \ - /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ - /usr/include/qt5/QtWidgets/qstyleoption.h \ - /usr/include/qt5/QtWidgets/qabstractspinbox.h \ - /usr/include/qt5/QtGui/qvalidator.h \ - /usr/include/qt5/QtWidgets/qslider.h \ - /usr/include/qt5/QtWidgets/qabstractslider.h \ - /usr/include/qt5/QtWidgets/qstyle.h \ - /usr/include/qt5/QtWidgets/qtabbar.h \ - /usr/include/qt5/QtWidgets/qrubberband.h \ - /usr/include/qt5/QtWidgets/QMenu \ - /usr/include/qt5/QtWidgets/qmenu.h \ - /usr/include/qt5/QtWidgets/QMenuBar \ - /usr/include/qt5/QtWidgets/qmenubar.h \ - /usr/include/qt5/QtWidgets/QPushButton \ - /usr/include/qt5/QtWidgets/qpushbutton.h \ - /usr/include/qt5/QtWidgets/qabstractbutton.h \ - /usr/include/qt5/QtWidgets/QSpacerItem \ - /usr/include/qt5/QtWidgets/QSplitter \ - /usr/include/qt5/QtWidgets/qsplitter.h \ - /usr/include/qt5/QtWidgets/QWidget \ - ../QChatClient/chatinputtext.h \ - /usr/include/qt5/QtWidgets/QTextEdit \ - /usr/include/qt5/QtWidgets/qtextedit.h \ - /usr/include/qt5/QtGui/qtextdocument.h \ - /usr/include/qt5/QtGui/qtextoption.h \ - /usr/include/qt5/QtGui/qtextcursor.h \ - /usr/include/qt5/QtGui/qtextformat.h \ - /usr/include/qt5/QtGui/qpen.h \ - /usr/include/qt5/QtGui/QKeyEvent \ - ../QChatClient/chatwidget.h \ - /usr/include/qt5/QtWidgets/QFileDialog \ - /usr/include/qt5/QtWidgets/qfiledialog.h \ - /usr/include/qt5/QtCore/qdir.h \ - /usr/include/qt5/QtCore/qfileinfo.h \ - /usr/include/qt5/QtCore/QFile \ - /usr/include/qt5/QtCore/QTextStream + ui_chatwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chatwindow.o ../QChatClient/chatwindow.cpp chatinputtext.o: ../QChatClient/chatinputtext.cpp ../QChatClient/chatinputtext.h \ @@ -2237,7 +2073,6 @@ chatinputtext.o: ../QChatClient/chatinputtext.cpp ../QChatClient/chatinputtext.h /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ diff --git a/build-QChatClient-Desktop-Debug/QChatClient b/build-QChatClient-Desktop-Debug/QChatClient index 60f4e9d..2f22f53 100755 Binary files a/build-QChatClient-Desktop-Debug/QChatClient and b/build-QChatClient-Desktop-Debug/QChatClient differ diff --git a/build-QChatClient-Desktop-Debug/Socket.o b/build-QChatClient-Desktop-Debug/Socket.o index 254b5da..143e0cd 100644 Binary files a/build-QChatClient-Desktop-Debug/Socket.o and b/build-QChatClient-Desktop-Debug/Socket.o differ diff --git a/build-QChatClient-Desktop-Debug/chatwidget.o b/build-QChatClient-Desktop-Debug/chatwidget.o index 9d12ee2..b12c5de 100644 Binary files a/build-QChatClient-Desktop-Debug/chatwidget.o and b/build-QChatClient-Desktop-Debug/chatwidget.o differ diff --git a/build-QChatClient-Desktop-Debug/chatwindow.o b/build-QChatClient-Desktop-Debug/chatwindow.o index 9bc9f7f..e09ca6d 100644 Binary files a/build-QChatClient-Desktop-Debug/chatwindow.o and b/build-QChatClient-Desktop-Debug/chatwindow.o differ diff --git a/build-QChatClient-Desktop-Debug/loginscreen.o b/build-QChatClient-Desktop-Debug/loginscreen.o index 50995e9..d355b79 100644 Binary files a/build-QChatClient-Desktop-Debug/loginscreen.o and b/build-QChatClient-Desktop-Debug/loginscreen.o differ diff --git a/build-QChatClient-Desktop-Debug/main.o b/build-QChatClient-Desktop-Debug/main.o index 2769b4a..63e0e74 100644 Binary files a/build-QChatClient-Desktop-Debug/main.o and b/build-QChatClient-Desktop-Debug/main.o differ diff --git a/build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp b/build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp index 1016adf..c256b92 100644 --- a/build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp +++ b/build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'chatinputtext.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'chatinputtext.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.2. It" +#error "This file was generated using the moc from 5.0.1. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_chatroom.cpp b/build-QChatClient-Desktop-Debug/moc_chatroom.cpp index 6da2c94..6471da8 100644 --- a/build-QChatClient-Desktop-Debug/moc_chatroom.cpp +++ b/build-QChatClient-Desktop-Debug/moc_chatroom.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'chatroom.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,15 +12,15 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'chatroom.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.2. It" +#error "This file was generated using the moc from 5.0.1. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif QT_BEGIN_MOC_NAMESPACE struct qt_meta_stringdata_Chatroom_t { - QByteArrayData data[20]; - char stringdata[244]; + QByteArrayData data[23]; + char stringdata[277]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -38,25 +38,29 @@ QT_MOC_LITERAL(5, 70, 10), QT_MOC_LITERAL(6, 81, 6), QT_MOC_LITERAL(7, 88, 15), QT_MOC_LITERAL(8, 104, 6), -QT_MOC_LITERAL(9, 111, 12), -QT_MOC_LITERAL(10, 124, 7), -QT_MOC_LITERAL(11, 132, 18), -QT_MOC_LITERAL(12, 151, 16), -QT_MOC_LITERAL(13, 168, 5), -QT_MOC_LITERAL(14, 174, 12), -QT_MOC_LITERAL(15, 187, 8), -QT_MOC_LITERAL(16, 196, 14), -QT_MOC_LITERAL(17, 211, 14), -QT_MOC_LITERAL(18, 226, 7), -QT_MOC_LITERAL(19, 234, 8) +QT_MOC_LITERAL(9, 111, 8), +QT_MOC_LITERAL(10, 120, 12), +QT_MOC_LITERAL(11, 133, 7), +QT_MOC_LITERAL(12, 141, 18), +QT_MOC_LITERAL(13, 160, 16), +QT_MOC_LITERAL(14, 177, 5), +QT_MOC_LITERAL(15, 183, 12), +QT_MOC_LITERAL(16, 196, 8), +QT_MOC_LITERAL(17, 205, 14), +QT_MOC_LITERAL(18, 220, 14), +QT_MOC_LITERAL(19, 235, 7), +QT_MOC_LITERAL(20, 243, 8), +QT_MOC_LITERAL(21, 252, 14), +QT_MOC_LITERAL(22, 267, 8) }, "Chatroom\0messagesToPrint\0\0" "serverMessagesToPrint\0statusMessagesToPrint\0" "createChat\0sender\0toggleConnected\0" - "status\0startSession\0sendMsg\0" + "status\0newUsers\0startSession\0sendMsg\0" "disconnectChatroom\0launchChatWindow\0" "index\0setConnected\0printMsg\0printServerMsg\0" "printStatusMsg\0newChat\0peerNick\0" + "updateUserList\0userlist\0" }; #undef QT_MOC_LITERAL @@ -66,30 +70,32 @@ static const uint qt_meta_data_Chatroom[] = { 7, // revision 0, // classname 0, 0, // classinfo - 14, 14, // methods + 16, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 5, // signalCount + 6, // signalCount // signals: name, argc, parameters, tag, flags - 1, 0, 84, 2, 0x05, - 3, 0, 85, 2, 0x05, - 4, 0, 86, 2, 0x05, - 5, 1, 87, 2, 0x05, - 7, 1, 90, 2, 0x05, + 1, 0, 94, 2, 0x05, + 3, 0, 95, 2, 0x05, + 4, 0, 96, 2, 0x05, + 5, 1, 97, 2, 0x05, + 7, 1, 100, 2, 0x05, + 9, 1, 103, 2, 0x05, // slots: name, argc, parameters, tag, flags - 9, 0, 93, 2, 0x0a, - 10, 0, 94, 2, 0x0a, - 11, 0, 95, 2, 0x0a, - 12, 1, 96, 2, 0x0a, - 14, 1, 99, 2, 0x0a, - 15, 0, 102, 2, 0x08, - 16, 0, 103, 2, 0x08, - 17, 0, 104, 2, 0x08, - 18, 1, 105, 2, 0x08, + 10, 0, 106, 2, 0x0a, + 11, 0, 107, 2, 0x0a, + 12, 0, 108, 2, 0x0a, + 13, 1, 109, 2, 0x0a, + 15, 1, 112, 2, 0x0a, + 16, 0, 115, 2, 0x08, + 17, 0, 116, 2, 0x08, + 18, 0, 117, 2, 0x08, + 19, 1, 118, 2, 0x08, + 21, 1, 121, 2, 0x08, // signals: parameters QMetaType::Void, @@ -97,17 +103,19 @@ static const uint qt_meta_data_Chatroom[] = { QMetaType::Void, QMetaType::Void, QMetaType::QString, 6, QMetaType::Void, QMetaType::Bool, 8, + QMetaType::Void, QMetaType::QString, 2, // slots: parameters QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::QModelIndex, 13, + QMetaType::Void, QMetaType::QModelIndex, 14, QMetaType::Void, QMetaType::Bool, 8, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::QString, 19, + QMetaType::Void, QMetaType::QString, 20, + QMetaType::Void, QMetaType::QString, 22, 0 // eod }; @@ -122,15 +130,17 @@ void Chatroom::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo case 2: _t->statusMessagesToPrint(); break; case 3: _t->createChat((*reinterpret_cast< QString(*)>(_a[1]))); break; case 4: _t->toggleConnected((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 5: _t->startSession(); break; - case 6: _t->sendMsg(); break; - case 7: _t->disconnectChatroom(); break; - case 8: _t->launchChatWindow((*reinterpret_cast< QModelIndex(*)>(_a[1]))); break; - case 9: _t->setConnected((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 10: _t->printMsg(); break; - case 11: _t->printServerMsg(); break; - case 12: _t->printStatusMsg(); break; - case 13: _t->newChat((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 5: _t->newUsers((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 6: _t->startSession(); break; + case 7: _t->sendMsg(); break; + case 8: _t->disconnectChatroom(); break; + case 9: _t->launchChatWindow((*reinterpret_cast< QModelIndex(*)>(_a[1]))); break; + case 10: _t->setConnected((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 11: _t->printMsg(); break; + case 12: _t->printServerMsg(); break; + case 13: _t->printStatusMsg(); break; + case 14: _t->newChat((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 15: _t->updateUserList((*reinterpret_cast< QString(*)>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -166,6 +176,12 @@ void Chatroom::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo *result = 4; } } + { + typedef void (Chatroom::*_t)(QString ); + if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&Chatroom::newUsers)) { + *result = 5; + } + } } } @@ -194,13 +210,13 @@ int Chatroom::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 14) + if (_id < 16) qt_static_metacall(this, _c, _id, _a); - _id -= 14; + _id -= 16; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 14) + if (_id < 16) *reinterpret_cast(_a[0]) = -1; - _id -= 14; + _id -= 16; } return _id; } @@ -236,4 +252,11 @@ void Chatroom::toggleConnected(bool _t1) void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; QMetaObject::activate(this, &staticMetaObject, 4, _a); } + +// SIGNAL 5 +void Chatroom::newUsers(QString _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 5, _a); +} QT_END_MOC_NAMESPACE diff --git a/build-QChatClient-Desktop-Debug/moc_chatroom.o b/build-QChatClient-Desktop-Debug/moc_chatroom.o index c574c1a..d4de34c 100644 Binary files a/build-QChatClient-Desktop-Debug/moc_chatroom.o and b/build-QChatClient-Desktop-Debug/moc_chatroom.o differ diff --git a/build-QChatClient-Desktop-Debug/moc_chatwidget.cpp b/build-QChatClient-Desktop-Debug/moc_chatwidget.cpp index d5554eb..2512a0a 100644 --- a/build-QChatClient-Desktop-Debug/moc_chatwidget.cpp +++ b/build-QChatClient-Desktop-Debug/moc_chatwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'chatwidget.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'chatwidget.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.2. It" +#error "This file was generated using the moc from 5.0.1. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_chatwidget.o b/build-QChatClient-Desktop-Debug/moc_chatwidget.o index ef99011..41c6889 100644 Binary files a/build-QChatClient-Desktop-Debug/moc_chatwidget.o and b/build-QChatClient-Desktop-Debug/moc_chatwidget.o differ diff --git a/build-QChatClient-Desktop-Debug/moc_chatwindow.cpp b/build-QChatClient-Desktop-Debug/moc_chatwindow.cpp index baa355a..456d9d8 100644 --- a/build-QChatClient-Desktop-Debug/moc_chatwindow.cpp +++ b/build-QChatClient-Desktop-Debug/moc_chatwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'chatwindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'chatwindow.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.2. It" +#error "This file was generated using the moc from 5.0.1. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_chatwindow.o b/build-QChatClient-Desktop-Debug/moc_chatwindow.o index 77b2ef6..4eb3632 100644 Binary files a/build-QChatClient-Desktop-Debug/moc_chatwindow.o and b/build-QChatClient-Desktop-Debug/moc_chatwindow.o differ diff --git a/build-QChatClient-Desktop-Debug/moc_loginscreen.cpp b/build-QChatClient-Desktop-Debug/moc_loginscreen.cpp index d449b2f..f8856b4 100644 --- a/build-QChatClient-Desktop-Debug/moc_loginscreen.cpp +++ b/build-QChatClient-Desktop-Debug/moc_loginscreen.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'loginscreen.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'loginscreen.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.2. It" +#error "This file was generated using the moc from 5.0.1. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_loginscreen.o b/build-QChatClient-Desktop-Debug/moc_loginscreen.o index 8cc9dbc..db060d6 100644 Binary files a/build-QChatClient-Desktop-Debug/moc_loginscreen.o and b/build-QChatClient-Desktop-Debug/moc_loginscreen.o differ diff --git a/build-QChatClient-Desktop-Debug/ui_chatroom.h b/build-QChatClient-Desktop-Debug/ui_chatroom.h index 6b17446..097be68 100644 --- a/build-QChatClient-Desktop-Debug/ui_chatroom.h +++ b/build-QChatClient-Desktop-Debug/ui_chatroom.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'chatroom.ui' ** -** Created by: Qt User Interface Compiler version 5.0.2 +** Created by: Qt User Interface Compiler version 5.0.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/build-QChatClient-Desktop-Debug/ui_chatwindow.h b/build-QChatClient-Desktop-Debug/ui_chatwindow.h index 61c3ad1..b4b5712 100644 --- a/build-QChatClient-Desktop-Debug/ui_chatwindow.h +++ b/build-QChatClient-Desktop-Debug/ui_chatwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'chatwindow.ui' ** -** Created by: Qt User Interface Compiler version 5.0.2 +** Created by: Qt User Interface Compiler version 5.0.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/build-QChatClient-Desktop-Debug/ui_loginscreen.h b/build-QChatClient-Desktop-Debug/ui_loginscreen.h index 13dc0a8..014dbf6 100644 --- a/build-QChatClient-Desktop-Debug/ui_loginscreen.h +++ b/build-QChatClient-Desktop-Debug/ui_loginscreen.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'loginscreen.ui' ** -** Created by: Qt User Interface Compiler version 5.0.2 +** Created by: Qt User Interface Compiler version 5.0.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ -- libgit2 0.22.2