diff --git a/.gitignore b/.gitignore index 75c107b..4e6f53e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ *.pro.user +*.o +moc* +.qmake.stash diff --git a/KonaClient b/KonaClient deleted file mode 100755 index 65568ff..0000000 Binary files a/KonaClient and /dev/null differ diff --git a/KonaClient.pro b/KonaClient.pro index ccd72f4..1d17ea2 100755 --- a/KonaClient.pro +++ b/KonaClient.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui network xml +QT += core gui network xml widgets TARGET = KonaClient TEMPLATE = app diff --git a/Makefile b/Makefile deleted file mode 100644 index 6691d76..0000000 --- a/Makefile +++ /dev/null @@ -1,404 +0,0 @@ -############################################################################# -# Makefile for building: KonaClient -# Generated by qmake (2.01a) (Qt 4.8.3) on: Do. Mär 28 10:46:21 2013 -# Project: KonaClient.pro -# Template: app -# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug CONFIG+=declarative_debug -o Makefile KonaClient.pro -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_WEBKIT -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4 -I. -I. -LINK = g++ -LFLAGS = -LIBS = $(SUBLIBS) -L/usr/lib/x86_64-linux-gnu -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/bin/qmake-qt4 -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = main.cpp \ - mainwindow.cpp \ - konasearch.cpp \ - konaclient.cpp \ - konaimage.cpp \ - flowlayout.cpp \ - konapreviewimageview.cpp \ - konatags.cpp \ - konatag.cpp \ - konarelatedtags.cpp \ - imageviewer.cpp moc_mainwindow.cpp \ - moc_konasearch.cpp \ - moc_konaclient.cpp \ - moc_konaimage.cpp \ - moc_konapreviewimageview.cpp \ - moc_konatags.cpp \ - moc_konatag.cpp \ - moc_konarelatedtags.cpp \ - moc_imageviewer.cpp -OBJECTS = main.o \ - mainwindow.o \ - konasearch.o \ - konaclient.o \ - konaimage.o \ - flowlayout.o \ - konapreviewimageview.o \ - konatags.o \ - konatag.o \ - konarelatedtags.o \ - imageviewer.o \ - moc_mainwindow.o \ - moc_konasearch.o \ - moc_konaclient.o \ - moc_konaimage.o \ - moc_konapreviewimageview.o \ - moc_konatags.o \ - moc_konatag.o \ - moc_konarelatedtags.o \ - moc_imageviewer.o -DIST = /usr/share/qt4/mkspecs/common/unix.conf \ - /usr/share/qt4/mkspecs/common/linux.conf \ - /usr/share/qt4/mkspecs/common/gcc-base.conf \ - /usr/share/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/share/qt4/mkspecs/common/g++-base.conf \ - /usr/share/qt4/mkspecs/common/g++-unix.conf \ - /usr/share/qt4/mkspecs/qconfig.pri \ - /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ - /usr/share/qt4/mkspecs/features/qt_functions.prf \ - /usr/share/qt4/mkspecs/features/qt_config.prf \ - /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/debug.prf \ - /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/declarative_debug.prf \ - /usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/share/qt4/mkspecs/features/warn_on.prf \ - /usr/share/qt4/mkspecs/features/qt.prf \ - /usr/share/qt4/mkspecs/features/unix/thread.prf \ - /usr/share/qt4/mkspecs/features/moc.prf \ - /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf \ - /usr/share/qt4/mkspecs/features/yacc.prf \ - /usr/share/qt4/mkspecs/features/lex.prf \ - /usr/share/qt4/mkspecs/features/include_source_dir.prf \ - KonaClient.pro -QMAKE_TARGET = KonaClient -DESTDIR = -TARGET = KonaClient - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile $(TARGET) - -$(TARGET): ui_mainwindow.h ui_konapreviewimageview.h ui_imageviewer.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: KonaClient.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/unix.conf \ - /usr/share/qt4/mkspecs/common/linux.conf \ - /usr/share/qt4/mkspecs/common/gcc-base.conf \ - /usr/share/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/share/qt4/mkspecs/common/g++-base.conf \ - /usr/share/qt4/mkspecs/common/g++-unix.conf \ - /usr/share/qt4/mkspecs/qconfig.pri \ - /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ - /usr/share/qt4/mkspecs/features/qt_functions.prf \ - /usr/share/qt4/mkspecs/features/qt_config.prf \ - /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/debug.prf \ - /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/declarative_debug.prf \ - /usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/share/qt4/mkspecs/features/warn_on.prf \ - /usr/share/qt4/mkspecs/features/qt.prf \ - /usr/share/qt4/mkspecs/features/unix/thread.prf \ - /usr/share/qt4/mkspecs/features/moc.prf \ - /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf \ - /usr/share/qt4/mkspecs/features/yacc.prf \ - /usr/share/qt4/mkspecs/features/lex.prf \ - /usr/share/qt4/mkspecs/features/include_source_dir.prf \ - /usr/lib/x86_64-linux-gnu/libQtXml.prl \ - /usr/lib/x86_64-linux-gnu/libQtGui.prl \ - /usr/lib/x86_64-linux-gnu/libQtNetwork.prl \ - /usr/lib/x86_64-linux-gnu/libQtCore.prl - $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug CONFIG+=declarative_debug -o Makefile KonaClient.pro -/usr/share/qt4/mkspecs/common/unix.conf: -/usr/share/qt4/mkspecs/common/linux.conf: -/usr/share/qt4/mkspecs/common/gcc-base.conf: -/usr/share/qt4/mkspecs/common/gcc-base-unix.conf: -/usr/share/qt4/mkspecs/common/g++-base.conf: -/usr/share/qt4/mkspecs/common/g++-unix.conf: -/usr/share/qt4/mkspecs/qconfig.pri: -/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri: -/usr/share/qt4/mkspecs/features/qt_functions.prf: -/usr/share/qt4/mkspecs/features/qt_config.prf: -/usr/share/qt4/mkspecs/features/exclusive_builds.prf: -/usr/share/qt4/mkspecs/features/default_pre.prf: -/usr/share/qt4/mkspecs/features/debug.prf: -/usr/share/qt4/mkspecs/features/default_post.prf: -/usr/share/qt4/mkspecs/features/declarative_debug.prf: -/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf: -/usr/share/qt4/mkspecs/features/warn_on.prf: -/usr/share/qt4/mkspecs/features/qt.prf: -/usr/share/qt4/mkspecs/features/unix/thread.prf: -/usr/share/qt4/mkspecs/features/moc.prf: -/usr/share/qt4/mkspecs/features/resources.prf: -/usr/share/qt4/mkspecs/features/uic.prf: -/usr/share/qt4/mkspecs/features/yacc.prf: -/usr/share/qt4/mkspecs/features/lex.prf: -/usr/share/qt4/mkspecs/features/include_source_dir.prf: -/usr/lib/x86_64-linux-gnu/libQtXml.prl: -/usr/lib/x86_64-linux-gnu/libQtGui.prl: -/usr/lib/x86_64-linux-gnu/libQtNetwork.prl: -/usr/lib/x86_64-linux-gnu/libQtCore.prl: -qmake: FORCE - @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug CONFIG+=declarative_debug -o Makefile KonaClient.pro - -dist: - @$(CHK_DIR_EXISTS) .tmp/KonaClient1.0.0 || $(MKDIR) .tmp/KonaClient1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/KonaClient1.0.0/ && $(COPY_FILE) --parents mainwindow.h konasearch.h konaclient.h konaimage.h flowlayout.h konapreviewimageview.h konatags.h konatag.h konarelatedtags.h imageviewer.h .tmp/KonaClient1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp konasearch.cpp konaclient.cpp konaimage.cpp flowlayout.cpp konapreviewimageview.cpp konatags.cpp konatag.cpp konarelatedtags.cpp imageviewer.cpp .tmp/KonaClient1.0.0/ && $(COPY_FILE) --parents mainwindow.ui konapreviewimageview.ui imageviewer.ui .tmp/KonaClient1.0.0/ && (cd `dirname .tmp/KonaClient1.0.0` && $(TAR) KonaClient1.0.0.tar KonaClient1.0.0 && $(COMPRESS) KonaClient1.0.0.tar) && $(MOVE) `dirname .tmp/KonaClient1.0.0`/KonaClient1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/KonaClient1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -check: first - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: moc_mainwindow.cpp moc_konasearch.cpp moc_konaclient.cpp moc_konaimage.cpp moc_konapreviewimageview.cpp moc_konatags.cpp moc_konatag.cpp moc_konarelatedtags.cpp moc_imageviewer.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_mainwindow.cpp moc_konasearch.cpp moc_konaclient.cpp moc_konaimage.cpp moc_konapreviewimageview.cpp moc_konatags.cpp moc_konatag.cpp moc_konarelatedtags.cpp moc_imageviewer.cpp -moc_mainwindow.cpp: konaclient.h \ - konasearch.h \ - konaimage.h \ - konatags.h \ - konatag.h \ - konarelatedtags.h \ - flowlayout.h \ - imageviewer.h \ - mainwindow.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp - -moc_konasearch.cpp: konaclient.h \ - konaimage.h \ - konasearch.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) konasearch.h -o moc_konasearch.cpp - -moc_konaclient.cpp: konaclient.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) konaclient.h -o moc_konaclient.cpp - -moc_konaimage.cpp: konaclient.h \ - konaimage.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) konaimage.h -o moc_konaimage.cpp - -moc_konapreviewimageview.cpp: konaimage.h \ - konaclient.h \ - konapreviewimageview.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) konapreviewimageview.h -o moc_konapreviewimageview.cpp - -moc_konatags.cpp: konatag.h \ - konaclient.h \ - konatags.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) konatags.h -o moc_konatags.cpp - -moc_konatag.cpp: konatag.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) konatag.h -o moc_konatag.cpp - -moc_konarelatedtags.cpp: konaclient.h \ - konatag.h \ - konarelatedtags.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) konarelatedtags.h -o moc_konarelatedtags.cpp - -moc_imageviewer.cpp: konaimage.h \ - konaclient.h \ - imageviewer.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) imageviewer.h -o moc_imageviewer.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_mainwindow.h ui_konapreviewimageview.h ui_imageviewer.h -compiler_uic_clean: - -$(DEL_FILE) ui_mainwindow.h ui_konapreviewimageview.h ui_imageviewer.h -ui_mainwindow.h: mainwindow.ui - /usr/bin/uic-qt4 mainwindow.ui -o ui_mainwindow.h - -ui_konapreviewimageview.h: konapreviewimageview.ui - /usr/bin/uic-qt4 konapreviewimageview.ui -o ui_konapreviewimageview.h - -ui_imageviewer.h: imageviewer.ui - /usr/bin/uic-qt4 imageviewer.ui -o ui_imageviewer.h - -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean compiler_uic_clean - -####### Compile - -main.o: main.cpp mainwindow.h \ - konaclient.h \ - konasearch.h \ - konaimage.h \ - konatags.h \ - konatag.h \ - konarelatedtags.h \ - flowlayout.h \ - imageviewer.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp - -mainwindow.o: mainwindow.cpp mainwindow.h \ - konaclient.h \ - konasearch.h \ - konaimage.h \ - konatags.h \ - konatag.h \ - konarelatedtags.h \ - flowlayout.h \ - imageviewer.h \ - ui_mainwindow.h \ - konapreviewimageview.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp - -konasearch.o: konasearch.cpp konasearch.h \ - konaclient.h \ - konaimage.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o konasearch.o konasearch.cpp - -konaclient.o: konaclient.cpp konaclient.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o konaclient.o konaclient.cpp - -konaimage.o: konaimage.cpp konaimage.h \ - konaclient.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o konaimage.o konaimage.cpp - -flowlayout.o: flowlayout.cpp flowlayout.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o flowlayout.o flowlayout.cpp - -konapreviewimageview.o: konapreviewimageview.cpp konapreviewimageview.h \ - konaimage.h \ - konaclient.h \ - ui_konapreviewimageview.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o konapreviewimageview.o konapreviewimageview.cpp - -konatags.o: konatags.cpp konatags.h \ - konatag.h \ - konaclient.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o konatags.o konatags.cpp - -konatag.o: konatag.cpp konatag.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o konatag.o konatag.cpp - -konarelatedtags.o: konarelatedtags.cpp konarelatedtags.h \ - konaclient.h \ - konatag.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o konarelatedtags.o konarelatedtags.cpp - -imageviewer.o: imageviewer.cpp imageviewer.h \ - konaimage.h \ - konaclient.h \ - ui_imageviewer.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o imageviewer.o imageviewer.cpp - -moc_mainwindow.o: moc_mainwindow.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp - -moc_konasearch.o: moc_konasearch.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_konasearch.o moc_konasearch.cpp - -moc_konaclient.o: moc_konaclient.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_konaclient.o moc_konaclient.cpp - -moc_konaimage.o: moc_konaimage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_konaimage.o moc_konaimage.cpp - -moc_konapreviewimageview.o: moc_konapreviewimageview.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_konapreviewimageview.o moc_konapreviewimageview.cpp - -moc_konatags.o: moc_konatags.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_konatags.o moc_konatags.cpp - -moc_konatag.o: moc_konatag.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_konatag.o moc_konatag.cpp - -moc_konarelatedtags.o: moc_konarelatedtags.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_konarelatedtags.o moc_konarelatedtags.cpp - -moc_imageviewer.o: moc_imageviewer.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_imageviewer.o moc_imageviewer.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/main.cpp b/main.cpp index 9eaa18f..f19bc21 100755 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "mainwindow.h" /*