Upgrade from Qt4 to Qt5

autogen.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+lrelease src/src.pro

backends/Makefile

@@ -0,0 +1,352 @@
+#############################################################################
+# Makefile for building: backends
+# Generated by qmake (3.0) (Qt 5.5.1)
+# Project:  backends.pro
+# Template: aux
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -spec linux-g++-64 CONFIG+=debug -o Makefile backends.pro
+#############################################################################
+
+MAKEFILE      = Makefile
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = 
+CFLAGS        = -m64 -pipe -g -Wall -W -fPIC $(DEFINES)
+CXXFLAGS      = -m64 -pipe -g -Wall -W -fPIC $(DEFINES)
+INCPATH       = -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
+COPY          = cp -f
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+INSTALL_FILE  = install -m 644 -p
+INSTALL_PROGRAM = install -m 755 -p
+INSTALL_DIR   = cp -f -R
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+DISTNAME      = backends1.0.0
+DISTDIR = /home/lixiang/work/kylin-assistant/backends/.tmp/backends1.0.0
+LINK          = g++
+LFLAGS        = -m64
+LIBS          = $(SUBLIBS)  
+AR            = ar cqs
+RANLIB        = 
+SED           = sed
+STRIP         = strip
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       =  
+OBJECTS       = 
+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_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.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_script.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.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_svg.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_x11extras.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 \
+		/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/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 \
+		backends.pro  
+QMAKE_TARGET  = backends
+DESTDIR       = #avoid trailing-slash linebreak
+TARGET        = backends
+TARGETA       = 
+TARGET0       = 
+TARGETD       = 
+TARGET1       = 
+TARGET2       = 
+
+
+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
+
+$(TARGET):  $(OBJECTS)  
+	
+
+Makefile: backends.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_multimedia.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.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_script.pri \
+		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.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_svg.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_x11extras.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 \
+		/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/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 \
+		backends.pro
+	$(QMAKE) -spec linux-g++-64 CONFIG+=debug -o Makefile backends.pro
+/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_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.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_script.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.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_svg.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_x11extras.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:
+/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/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:
+backends.pro:
+qmake: FORCE
+	@$(QMAKE) -spec linux-g++-64 CONFIG+=debug -o Makefile backends.pro
+
+qmake_all: FORCE
+
+
+all: Makefile $(TARGET)
+
+dist: distdir FORCE
+	(cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR)
+
+distdir: FORCE
+	@test -d $(DISTDIR) || mkdir -p $(DISTDIR)
+	$(COPY_FILE) --parents $(DIST) $(DISTDIR)/
+
+
+clean: compiler_clean 
+	-$(DEL_FILE) *~ core *.core
+
+
+distclean: clean 
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
+	-$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+check: first
+
+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: 
+
+####### Compile
+
+####### Install
+
+install_inst1: first FORCE
+	@test -d $(INSTALL_ROOT)/usr/lib/python2.7/dist-packages/kylin-assistant-daemon/ || mkdir -p $(INSTALL_ROOT)/usr/lib/python2.7/dist-packages/kylin-assistant-daemon/
+	-$(INSTALL_DIR) /home/lixiang/work/kylin-assistant/backends/kylin-assistant-daemon/src $(INSTALL_ROOT)/usr/lib/python2.7/dist-packages/kylin-assistant-daemon/
+
+uninstall_inst1: FORCE
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/lib/python2.7/dist-packages/kylin-assistant-daemon/src
+	-$(DEL_DIR) $(INSTALL_ROOT)/usr/lib/python2.7/dist-packages/kylin-assistant-daemon/ 
+
+
+install_inst2: first FORCE
+	@test -d $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ || mkdir -p $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/
+	-$(INSTALL_DIR) /home/lixiang/work/kylin-assistant/backends/kylin-assistant-daemon/data/beautify/autostart $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/
+
+uninstall_inst2: FORCE
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/autostart
+	-$(DEL_DIR) $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ 
+
+
+install_inst3: first FORCE
+	@test -d $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ || mkdir -p $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/
+	-$(INSTALL_DIR) /home/lixiang/work/kylin-assistant/backends/kylin-assistant-daemon/data/beautify/plymouth $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/
+
+uninstall_inst3: FORCE
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/plymouth
+	-$(DEL_DIR) $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ 
+
+
+install_inst4: first FORCE
+	@test -d $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ || mkdir -p $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/
+	-$(INSTALL_DIR) /home/lixiang/work/kylin-assistant/backends/kylin-assistant-daemon/data/beautify/sound-theme $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/
+
+uninstall_inst4: FORCE
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/sound-theme
+	-$(DEL_DIR) $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ 
+
+
+install_inst5: first FORCE
+	@test -d $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ || mkdir -p $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/
+	-$(INSTALL_FILE) /home/lixiang/work/kylin-assistant/backends/kylin-assistant-daemon/data/ubuntukylin-default-settings.ini $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/
+
+uninstall_inst5: FORCE
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ubuntukylin-default-settings.ini
+	-$(DEL_DIR) $(INSTALL_ROOT)/var/lib/kylin-assistant-daemon/ 
+
+
+install: install_inst1 install_inst2 install_inst3 install_inst4 install_inst5  FORCE
+
+uninstall: uninstall_inst1 uninstall_inst2 uninstall_inst3 uninstall_inst4 uninstall_inst5  FORCE
+
+FORCE:
+

backends/backends.pro

@@ -1,15 +1,15 @@
 TEMPLATE = aux
 
-inst1.files += ../backends/youker-assistant-daemon/src/
-inst1.path = /usr/lib/python2.7/dist-packages/youker-assistant-daemon/
-inst2.files += ../backends/youker-assistant-daemon/data/beautify/autostart/
-inst2.path = /var/lib/youker-assistant-daemon/
-inst3.files += ../backends/youker-assistant-daemon/data/beautify/plymouth/
-inst3.path = /var/lib/youker-assistant-daemon/
-inst4.files += ../backends/youker-assistant-daemon/data/beautify/sound-theme/
-inst4.path = /var/lib/youker-assistant-daemon/
-inst5.files += ../backends/youker-assistant-daemon/data/ubuntukylin-default-settings.ini
-inst5.path = /var/lib/youker-assistant-daemon/
+inst1.files += ../backends/kylin-assistant-daemon/src/
+inst1.path = /usr/lib/python2.7/dist-packages/kylin-assistant-daemon/
+inst2.files += ../backends/kylin-assistant-daemon/data/beautify/autostart/
+inst2.path = /var/lib/kylin-assistant-daemon/
+inst3.files += ../backends/kylin-assistant-daemon/data/beautify/plymouth/
+inst3.path = /var/lib/kylin-assistant-daemon/
+inst4.files += ../backends/kylin-assistant-daemon/data/beautify/sound-theme/
+inst4.path = /var/lib/kylin-assistant-daemon/
+inst5.files += ../backends/kylin-assistant-daemon/data/ubuntukylin-default-settings.ini
+inst5.path = /var/lib/kylin-assistant-daemon/
 
 INSTALLS += inst1 \
     inst2 \

backends/kylin-assistant-daemon/dbus/com.kylin.assistant.systemdaemon.conf

@@ -6,16 +6,16 @@
 <busconfig>
     <!-- Only root can own the service -->
     <policy user="root">
-        <allow own="com.ubuntukylin.youker"/>
-        <allow send_interface="com.ubuntukylin.youker"/>
+        <allow own="com.kylin.assistant.systemdaemon"/>
+        <allow send_interface="com.kylin.assistant.systemdaemon"/>
     </policy>
     
     <!-- Allow anyone to invoke methods on the interfaces -->
     <policy context="default">
-        <allow send_interface="com.ubuntukylin.youker"/>
-        <allow send_destination="com.ubuntukylin.youker"
+        <allow send_interface="com.kylin.assistant.systemdaemon"/>
+        <allow send_destination="com.kylin.assistant.systemdaemon"
            send_interface="org.freedesktop.DBus.Introspectable"/>
-        <allow send_destination="com.ubuntukylin.youker"
+        <allow send_destination="com.kylin.assistant.systemdaemon"
            send_interface="org.freedesktop.DBus.Properties"/>
     </policy>
 </busconfig>

backends/kylin-assistant-daemon/dbus/com.kylin.assistant.systemdaemon.policy

@@ -4,11 +4,11 @@
  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
 <policyconfig>
 
-  <vendor>Youker Assistant</vendor>
-  <vendor_url>http://ubuntukylin.com</vendor_url>
-  <icon_name>youker-assistant</icon_name>
+  <vendor>Kylin Assistant</vendor>
+  <vendor_url>www.kylinos.cn</vendor_url>
+  <icon_name>kylin-assistant</icon_name>
 
-  <action id="com.ubuntukylin.youker.action">
+  <action id="com.kylin.assistant.systemdaemon.action">
     <_description>
       system level settings
     </_description>

backends/kylin-assistant-daemon/dbus/com.kylin.assistant.systemdaemon.service

@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.kylin.assistant.systemdaemon
+Exec=/usr/bin/kylin-assistant-backend.py
+User=root

backends/kylin-assistant-daemon/dbus/com.ubuntukylin.session.service

@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.kylin.assistant.sessiondaemon
+Exec=/usr/bin/kylin-assistant-session.py

backends/kylin-assistant-daemon/src/beautify/gsettings.py

@@ -20,7 +20,7 @@ from gi.repository import Gio as gio
 from common import Schema
 import logging
 
-logger=logging.getLogger('youker-assistant-daemon')
+logger=logging.getLogger('kylin-assistant-daemon')
 
 def get(schema, path, key, type):
     try:

backends/kylin-assistant-daemon/src/beautify/others.py

@@ -27,7 +27,7 @@ class Others:
     # custom plymouth bg by plymouthName
     def custom_plymouth_bg(self, plymouthName):
         plymouthName = plymouthName.encode('utf-8')
-        existingDir = '/var/lib/youker-assistant-daemon/plymouth/existing/'
+        existingDir = '/var/lib/kylin-assistant-daemon/plymouth/existing/'
         linkFileDir = '/lib/plymouth/themes/default.plymouth'
 
         # replace the config file
@@ -43,9 +43,9 @@ class Others:
         if(plymouthName in existingPlymouth):
             return False
         else:
-            existingDir = '/var/lib/youker-assistant-daemon/plymouth/existing/'
-            customScript = '/var/lib/youker-assistant-daemon/plymouth/defaults/only_background.script'
-            defaultplymouthfile = '/var/lib/youker-assistant-daemon/plymouth/defaults/default.plymouth'
+            existingDir = '/var/lib/kylin-assistant-daemon/plymouth/existing/'
+            customScript = '/var/lib/kylin-assistant-daemon/plymouth/defaults/only_background.script'
+            defaultplymouthfile = '/var/lib/kylin-assistant-daemon/plymouth/defaults/default.plymouth'
 			
             # add new plymouth conf dir
             os.mkdir(existingDir + plymouthName)
@@ -53,12 +53,12 @@ class Others:
             # modify config file
             fileHandle = open(existingDir + plymouthName + '/default.plymouth', 'a')
             fileHandle.write('ImageDir=/lib/plymouth/themes/' + plymouthName + '\n')
-            fileHandle.write('ScriptFile=/lib/plymouth/themes/' + plymouthName + '/youker.script')
+            fileHandle.write('ScriptFile=/lib/plymouth/themes/' + plymouthName + '/kylin.script')
             fileHandle.close()
 
             # add new system plymouth dir
             os.mkdir('/lib/plymouth/themes/' + plymouthName)
-            shutil.copy(customScript, '/lib/plymouth/themes/' + plymouthName + '/youker.script')
+            shutil.copy(customScript, '/lib/plymouth/themes/' + plymouthName + '/kylin.script')
             #shutil.copy(customBG, '/lib/plymouth/themes/' + plymouthName + '/customBG.png')
             Image.open(customBG).save('/lib/plymouth/themes/' + plymouthName + '/customBG.png')
 			
@@ -67,7 +67,7 @@ class Others:
     # get existing plymouth list
     def get_existing_plymouth_list(self):
         result = []
-        edir = ('/var/lib/youker-assistant-daemon/plymouth/existing')
+        edir = ('/var/lib/kylin-assistant-daemon/plymouth/existing')
         if os.path.isdir(edir):
             for f in os.listdir(edir):
                 if os.path.isdir(os.path.join(edir, f)):
@@ -77,12 +77,12 @@ class Others:
 
     # check and save current plymouth when init
     def plymouth_init_check(self):
-        existingDir = '/var/lib/youker-assistant-daemon/plymouth/existing/'
+        existingDir = '/var/lib/kylin-assistant-daemon/plymouth/existing/'
         linkFileDir = '/lib/plymouth/themes/default.plymouth'
 
         # add 0619
         if(os.path.exists('/lib/plymouth/themes/ubuntukylin-logo') == False):
-            shutil.copytree('/var/lib/youker-assistant-daemon/plymouth/ubuntukylin-logo/', '/lib/plymouth/themes/ubuntukylin-logo')
+            shutil.copytree('/var/lib/kylin-assistant-daemon/plymouth/ubuntukylin-logo/', '/lib/plymouth/themes/ubuntukylin-logo')
 
         # locate the current plymouth theme dir
         linkFile = open(linkFileDir)
@@ -107,7 +107,7 @@ class Others:
         name = name.encode('utf-8')
 #        if not os.path.exists('/lib/plymouth/themes/' + name + '/customBG.png') :
         if not os.path.exists('/lib/plymouth/themes/' + name + '/' + name + '.script') :
-            if not os.path.exists('/lib/plymouth/themes/' + name + '/youker.script') :
+            if not os.path.exists('/lib/plymouth/themes/' + name + '/kylin.script') :
                 if not os.path.exists('/lib/plymouth/themes/' + name + '/customBG.png') :
                     return "False"
                 else:
@@ -131,7 +131,7 @@ class Others:
         elif plymouthName == 'ubuntukylin-logo':
             return 'sys'
         else :
-            shutil.rmtree('/var/lib/youker-assistant-daemon/plymouth/existing/' + plymouthName)
+            shutil.rmtree('/var/lib/kylin-assistant-daemon/plymouth/existing/' + plymouthName)
             shutil.rmtree('/lib/plymouth/themes/' + plymouthName)
             return 'ok'
 #        plymouthName = plymouthName.encode('utf-8')
@@ -143,7 +143,7 @@ class Others:
 #        if used == plymouthName :
 #            return False
 #        else :
-#            shutil.rmtree('/var/lib/youker-assistant-daemon/plymouth/existing/' + plymouthName)
+#            shutil.rmtree('/var/lib/kylin-assistant-daemon/plymouth/existing/' + plymouthName)
 #            shutil.rmtree('/lib/plymouth/themes/' + plymouthName)
 #            return True
 

backends/kylin-assistant-daemon/src/beautify/sound.py

@@ -91,7 +91,7 @@ class Sound:
     # enable the login music
     def set_login_music_enable(self, flag):
         configdir = self.homedir + '/.config/autostart'
-        desktopfile = '/var/lib/youker-assistant-daemon/autostart/libcanberra-login-sound.desktop'
+        desktopfile = '/var/lib/kylin-assistant-daemon/autostart/libcanberra-login-sound.desktop'
         targetfile = configdir + '/libcanberra-login-sound.desktop'
 
         if flag:
@@ -117,7 +117,7 @@ class Sound:
 
     # get sound themes & check and bak sounds
     def get_sound_themes(self):
-        bakDir = '/var/lib/youker-assistant-daemon/sound-theme/'
+        bakDir = '/var/lib/kylin-assistant-daemon/sound-theme/'
         dirs = ('/usr/share/sounds', os.path.join(self.homedir, ".sounds"))
         filters = ('index.theme', '')
         valid = utils.check_dirs(dirs, filters, True)
@@ -186,7 +186,7 @@ class Sound:
     # restore sound file
     def restore_sound_file(self, targetSoundFile):
         targetSoundFile = targetSoundFile.encode('utf-8')
-        bakDir = '/var/lib/youker-assistant-daemon/sound-theme/'
+        bakDir = '/var/lib/kylin-assistant-daemon/sound-theme/'
         currentTheme = self.get_sound_theme()
         if(os.path.exists(os.path.join(self.homedir, ".sounds") + currentTheme)):
             soundDir = os.path.join(self.homedir, ".sounds") + currentTheme
@@ -199,7 +199,7 @@ class Sound:
 
     # restore all sound file in current sound theme
     def restore_all_sound_file(self, soundTheme):
-        bakSoundThemeDir = '/var/lib/youker-assistant-daemon/sound-theme/' + soundTheme
+        bakSoundThemeDir = '/var/lib/kylin-assistant-daemon/sound-theme/' + soundTheme
         if(os.path.exists(os.path.join(self.homedir, ".sounds") + soundTheme)):
             soundDir = os.path.join(self.homedir, ".sounds") + soundTheme
         elif(os.path.exists('/usr/share/sounds/' + soundTheme)):

backends/kylin-assistant-daemon/src/detailinfo/cpuinfo.py

@@ -36,8 +36,8 @@ import gettext
 ##from gettext import gettext as _
 ##from gettext import ngettext as __
 #locale.setlocale(locale.LC_ALL, "")
-#gettext.bindtextdomain("youker-assistant", "/usr/share/locale")
-#gettext.textdomain("youker-assistant")
+#gettext.bindtextdomain("kylin-assistant", "/usr/share/locale")
+#gettext.textdomain("kylin-assistant")
 #_ = gettext.gettext
 
 CPU_CURRENT_FREQ = ""

backends/kylin-assistant-daemon/src/policykit/__init__.py

@@ -0,0 +1 @@
+UK_ACTION_YOUKER = 'com.kylin.assistant.systemdaemon.action'

backends/kylin-assistant-daemon/src/policykit/dbusproxy.py

@@ -21,15 +21,15 @@ import dbus.service
 import logging
 log = logging.getLogger("DbusProxy")
 
-INTERFACE = 'com.ubuntukylin.youker'
-UKPATH = '/'
+INTERFACE = 'com.kylin.assistant.systemdaemon'
+UKPATH = '/com/kylin/assistant/systemdaemon'
 SHOWED = False
 
 def show_message(*args):
     from dialogs import ErrorDialog
     title = 'Daemon start failed'
-    message = ('Youker Assisant systemdaemon didn\'t start correctly.\n'
-                'If you want to help developers debugging, try to run "<b>sudo /usr/lib/python2.7/dist-packages/youker-assistant-daemon/src/start_systemdbus.py</b>" in a terminal.')
+    message = ('Kylin Assisant systemdaemon didn\'t start correctly.\n'
+                'If you want to help developers debugging, try to run "<b>sudo /usr/lib/python2.7/dist-packages/kylin-assistant-daemon/src/start_systemdbus.py</b>" in a terminal.')
     ErrorDialog(title=title, message=message).launch()
 
 def nothing(*args):
@@ -60,7 +60,7 @@ class DbusProxy:
 class AccessDeniedException(dbus.DBusException):
     '''This exception is raised when some operation is not permitted.'''
 
-    _dbus_error_name = 'com.ubuntukylin.youker.AccessDeniedException'
+    _dbus_error_name = 'com.kylin.assistant.systemdaemon.AccessDeniedException'
 
 def init_dbus(dbus_iface=INTERFACE, dbus_path=UKPATH):
     '''init dbus'''

backends/kylin-assistant-daemon/src/sessiondbus/daemon.py

@@ -90,8 +90,8 @@ from sso.ubuntusso import get_ubuntu_sso_backend
 log = logging.getLogger('SessionDaemon')
 #from slider.wizard import Wizard
 
-INTERFACE = "com.ubuntukylin.session"
-UKPATH = "/"
+INTERFACE = "com.kylin.assistant.sessiondaemon"
+UKPATH = "/com/kylin/assistant/sessiondaemon"
 POWER_PATH = "/sys/class/power_supply"
 BATTERY_PATH = "/sys/class/power_supply/BAT0"
 BAT_FILE = "/sys/class/power_supply/BAT0/uevent"
@@ -378,7 +378,7 @@ class SessionDaemon(dbus.service.Object):
     def currently_installed_version(self):
         apt_list = []
         cache = apt.Cache()
-        pkg = cache['youker-assistant']
+        pkg = cache['kylin-assistant']
         installed_version = pkg.installed.version
 #        print installed_version
         if ":" in installed_version:
@@ -653,9 +653,9 @@ class SessionDaemon(dbus.service.Object):
 
     #-----------------------------distrowatch rank-----------------------------
     def copy_distrowatch_default_conf(self):
-        distrowatch_path = HOME + '/.config/ubuntukylin/youker-assistant/distrowatch.conf'
+        distrowatch_path = HOME + '/.config/ubuntukylin/kylin-assistant/distrowatch.conf'
         distrowatch_path_uk = HOME + '/.config/ubuntukylin'
-        distrowatch_path_youker = HOME + '/.config/ubuntukylin/youker-assistant'
+        distrowatch_path_youker = HOME + '/.config/ubuntukylin/kylin-assistant'
         if not os.path.isdir(distrowatch_path_uk):
             os.makedirs(distrowatch_path_uk)
         if not os.path.isdir(distrowatch_path_youker):
@@ -663,7 +663,7 @@ class SessionDaemon(dbus.service.Object):
         if not os.path.exists(distrowatch_path):
             if not os.path.exists(distrowatch_path):
                 os.mknod(distrowatch_path)
-            srcFile = '/var/lib/youker-assistant-daemon/distrowatch.conf'
+            srcFile = '/var/lib/kylin-assistant-daemon/distrowatch.conf'
             if not os.path.exists(srcFile):
                 print "error with distrowatch file"
                 return
@@ -2120,7 +2120,7 @@ class SessionDaemon(dbus.service.Object):
     # -------------------------pingback-------------------------
     def get_last_time(self):
         time_text = None
-        usrPath = os.path.join(HOME, '.config/ubuntukylin/youker-assistant/pingback.time')
+        usrPath = os.path.join(HOME, '.config/ubuntukylin/kylin-assistant/pingback.time')
         if os.path.exists(usrPath):
             fp = open(usrPath)
             try:
@@ -2130,7 +2130,7 @@ class SessionDaemon(dbus.service.Object):
         return time_text
 
     def set_last_time(self, time_text):
-        abs_path = os.path.join(HOME, '.config/ubuntukylin/youker-assistant')
+        abs_path = os.path.join(HOME, '.config/ubuntukylin/kylin-assistant')
         if not os.path.isdir(abs_path):
             os.makedirs(abs_path)
         usrPath = os.path.join(abs_path, 'pingback.time')

backends/kylin-assistant-daemon/src/sessiondbus/unzip.py

@@ -29,8 +29,8 @@ HOME_PATH = os.path.expandvars('$HOME')
 
 def generate_tmp_path(name):
     assert(isinstance(name, str))
-#    dest_path = HOME_PATH + "/.config/ubuntukylin/youker-assistant/"
-    dest_path = HOME_PATH + "/.cache/youker-assistant/"
+#    dest_path = HOME_PATH + "/.config/ubuntukylin/kylin-assistant/"
+    dest_path = HOME_PATH + "/.cache/kylin-assistant/"
     folder_path = dest_path + name
     if os.path.exists(folder_path):
         shutil.rmtree(folder_path)

backends/kylin-assistant-daemon/src/slider/wizard.py

@@ -218,8 +218,8 @@ class Wizard(gtk.Window):
         self.window_align.set_padding(2, 2, 2, 2)
         self.add(self.window_align)
         self.window_align.add(self.window_box)
-        wizard_dir = "/usr/share/youker-assistant/qml/img/zh_CN/wizard"
-        wizard_root_dir = "/usr/share/youker-assistant/qml/img/icons"
+        wizard_dir = "/usr/share/kylin-assistant/qml/img/zh_CN/wizard"
+        wizard_root_dir = "/usr/share/kylin-assistant/qml/img/icons"
         slider_icons = (os.path.join(wizard_dir, "%d.png" % i) for i in range(3))
         pointer_icons = (os.path.join(wizard_root_dir, "dot_normal.png"), os.path.join(wizard_root_dir, "dot_active.png"))
         button_icons = (os.path.join(wizard_dir, "start_normal.png"), os.path.join(wizard_dir, "start_press.png"))
@@ -231,7 +231,7 @@ class Wizard(gtk.Window):
         self.move_window_event(self.event_box)
 
     def destroy_wizard(self, widget):
-        print 'Youker-Assistant slide show is over!'
+        print 'Kylin-Assistant slide show is over!'
         #widget.destory()
 
     def is_left_button(self, event):

backends/kylin-assistant-daemon/src/sso/enums.py

@@ -50,5 +50,5 @@ SOFTWARE_CENTER_NAME_KEYRING = "Youker ID"
 SOFTWARE_CENTER_SSO_DESCRIPTION = '注册或登录优客账号。'
 datadir = './sso/utils/'
 PISTON_GENERIC_HELPER = "piston_generic_helper.py"
-YOUKER_ASSISTANT_CACHE_DIR = os.path.join(xdg.xdg_cache_home, "youker-assistant")
-safe_makedirs(YOUKER_ASSISTANT_CACHE_DIR)
+YOUKER_ASSISTANT_CACHE_DIR = os.path.join(xdg.xdg_cache_home, "kylin-assistant")
+safe_makedirs(YOUKER_ASSISTANT_CACHE_DIR)

backends/kylin-assistant-daemon/src/start_sessiondbus.py

@@ -25,7 +25,7 @@ from single import SingleInstance
 #import gobject
 
 if __name__ == '__main__':
-    myapp = SingleInstance("/tmp/youker-assistant-sessiondbus-%d.pid" % os.getuid())
+    myapp = SingleInstance("/tmp/kylin-assistant-sessiondbus-%d.pid" % os.getuid())
     if myapp.is_already_running():
         print "Another instance of this sessiondbus is already running"
         sys.exit("Another instance of this sessiondbus is already running")

backends/kylin-assistant-daemon/src/start_systemdbus.py

@@ -24,7 +24,7 @@ from single import SingleInstance
 #import gobject
 
 if __name__ == '__main__':
-    myapp = SingleInstance("/tmp/youker-assistant-systemdbus-%d.pid" % os.getuid())
+    myapp = SingleInstance("/tmp/kylin-assistant-systemdbus-%d.pid" % os.getuid())
     if myapp.is_already_running():
         print "Another instance of this systemdbus is already running"
         sys.exit("Another instance of this systemdbus is already running")

backends/kylin-assistant-daemon/src/systemdbus/daemon.py

@@ -48,8 +48,8 @@ from beautify.theme import Theme
 log = logging.getLogger('Daemon')
 
 
-INTERFACE = 'com.ubuntukylin.youker'
-UKPATH = '/'
+INTERFACE = 'com.kylin.assistant.systemdaemon'
+UKPATH = '/com/kylin/assistant/systemdaemon'
 
 #------------------------------------apt start----------------------------
 from apt_handler import AppActions, AptHandler, WorkitemError

backends/kylin-assistant-daemon/src/systemdbus/server.py

@@ -10,7 +10,7 @@ import dbus.service
 class AccessDeniedException(dbus.DBusException):
     '''This exception is raised when some operation is not permitted.'''
 
-    _dbus_error_name = 'com.ubuntukylin.youker.AccessDeniedException'
+    _dbus_error_name = 'com.kylin.assistant.systemdaemon.AccessDeniedException'
 
 
 class PolicyKitService(dbus.service.Object):

backends/youker-assistant-daemon/dbus/com.ubuntukylin.session.service

@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.ubuntukylin.session
-Exec=/usr/bin/youker-assistant-session.py

backends/youker-assistant-daemon/dbus/com.ubuntukylin.youker.service

@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.ubuntukylin.youker
-Exec=/usr/bin/youker-assistant-backend.py
-User=root

backends/youker-assistant-daemon/src/policykit/__init__.py

@@ -1 +0,0 @@
-UK_ACTION_YOUKER = 'com.ubuntukylin.youker.action'

cleaner/cleanerdetailwidget.cpp

@@ -19,7 +19,7 @@
 
 #include "cleanerdetailwidget.h"
 #include "ui_cleanerdetailwidget.h"
-#include "../mainui/mainwindow.h"
+#include "../src/mainwindow.h"
 #include "../component/cleansubgroup.h"
 #include <QDebug>
 #include <QBoxLayout>
@@ -32,7 +32,7 @@ CleanerDetailWidget::CleanerDetailWidget(QWidget *parent, SessionDispatcher *ser
 //    this->setStyleSheet("QWidget{border: none}");
     this->setFixedSize(900, 403);
     this->setObjectName("transparentWidget");
-    this->setWindowIcon(QIcon(":/res/youker-assistant.png"));
+    this->setWindowIcon(QIcon(":/res/kylin-assistant.png"));
 
     /*this->setAutoFillBackground(true);
     QPalette palette;

cleaner/cleaneritems.cpp

@@ -20,6 +20,8 @@
 #include "cleaneritems.h"
 #include "mainwindow.h"
 #include <QDebug>
+#include <QCheckBox>
+#include <QGroupBox>
 
 //CleanerItems::CleanerItems(QStringList &arglist, QStringList &statuslist, int height, const QString title_text, QWidget *parent)
 //    : QWidget(parent),titleName(title_text)/*, widgetHeight(height)*/
@@ -29,7 +31,7 @@ CleanerItems::CleanerItems(QStringList &arglist, QStringList &statuslist, QStrin
 {
     setWindowFlags(Qt::FramelessWindowHint);
     this->setStyleSheet("QDialog{border: 1px solid white;border-radius:1px;background-color: #ffffff;}");
-    this->setWindowIcon(QIcon(":/res/youker-assistant.png"));
+    this->setWindowIcon(QIcon(":/res/kylin-assistant.png"));
 
     this->setFixedSize(410, height);
 //    this->setObjectName("transparentWidget");

cleaner/cleanermainwidget.cpp

@@ -19,7 +19,7 @@
 
 #include "cleanermainwidget.h"
 #include <QDebug>
-#include "../mainui/mainwindow.h"
+#include "../src/mainwindow.h"
 #include "../component/cleangroup.h"
 
 CleanerMainWidget::CleanerMainWidget(QWidget *parent, SessionDispatcher *seroxy, MainWindow *window, Toolkits *kits, QString skin)