December 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8009 - in /trunk/libzypp/zypp/sat: Pool.cc SATResolver.cc
by schubi2＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: schubi2 Date: Mon Dec 3 15:54:17 2007 New Revision: 8009 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8009&view=rev Log: whatprovides will be reset; do not know why Modified: trunk/libzypp/zypp/sat/Pool.cc trunk/libzypp/zypp/sat/SATResolver.cc Modified: trunk/libzypp/zypp/sat/Pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Pool.cc?rev=800… ============================================================================== --- trunk/libzypp/zypp/sat/Pool.cc (original) +++ trunk/libzypp/zypp/sat/Pool.cc Mon Dec 3 15:54:17 2007 @@ -139,7 +139,7 @@ { return str << "sat::pool(" << obj.serial() << "){" << obj.reposSize() << "repos|" - << obj.solvablesSize() << "slov}"; + << obj.solvablesSize() << "slov}" << "whatprovides *"<< obj.get()->whatprovides; } ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Mon Dec 3 15:54:17 2007 @@ -361,7 +361,6 @@ SATResolver::resolvePool() { SATCollectTransact info (*this); - MIL << "SATResolver::resolvePool()" << endl; if (solv) { @@ -405,8 +404,9 @@ queue_push( &(jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); queue_push( &(jobQueue), id); } - solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get() ); + sat::Pool::instance().setDirty(); + sat::Pool::instance().prepare(); solv->fixsystem = false; solv->updatesystem = false; solv->allowdowngrade = false; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8008 - /trunk/libzypp/zypp/sat/SATResolver.cc
by schubi2＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: schubi2 Date: Mon Dec 3 14:58:31 2007 New Revision: 8008 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8008&view=rev Log: further error handling Modified: trunk/libzypp/zypp/sat/SATResolver.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Mon Dec 3 14:58:31 2007 @@ -473,6 +473,27 @@ //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- +// helper function +//---------------------------------------------------------------------------- + +struct FindPackage : public resfilter::ResObjectFilterFunctor +{ + ProblemSolutionCombi *problemSolution; + TransactionKind action; + FindPackage (ProblemSolutionCombi *p, const TransactionKind act) + : problemSolution (p) + , action (act) + { + } + + bool operator()( PoolItem_Ref p) + { + problemSolution->addSingleAction (p, action); + return true; + } +}; + std::string SATResolver::SATprobleminfoString(Id problem) { @@ -599,26 +620,80 @@ } break; case SOLVER_INSTALL_SOLVABLE_NAME: - MIL << "- do not install "<< id2str(pool, what) << endl;; - ERR << "No valid solution available" << endl; + { + FindPackage info (problemSolution, KEEP); + string package_name (id2str(pool, what)); + invokeOnEach( _pool.byNameBegin( package_name ), + _pool.byNameEnd( package_name ), + resfilter::ByUninstalled (), + functor::functorRef<bool,PoolItem> (info) ); + string description = str::form (_("do not install %s"), id2str(pool, what)); + MIL << description << endl; + problemSolution->setDescription (description); + } break; case SOLVER_ERASE_SOLVABLE_NAME: - MIL << "- do not deinstall " << id2str(pool, what) << endl; - ERR << "No valid solution available" << endl; + { + FindPackage info (problemSolution, KEEP); + string package_name (id2str(pool, what)); + invokeOnEach( _pool.byNameBegin( package_name ), + _pool.byNameEnd( package_name ), + functor::chain (resfilter::ByInstalled (), // ByInstalled + resfilter::ByTransact ()), // will be deinstalled + functor::functorRef<bool,PoolItem> (info) ); + string description = str::form (_("do not deinstall %s"), id2str(pool, what)); + MIL << description << endl; + problemSolution->setDescription (description); + } break; case SOLVER_INSTALL_SOLVABLE_PROVIDES: - MIL << "- do not install a solvable providing " << dep2str(pool, what) << endl; - ERR << "No valid solution available" << endl; + { + Id p, *pp; + FOR_PROVIDES(p, pp, what); + { + PoolItem_Ref poolItem = _pool.find (sat::Solvable(p)); + if (poolItem.status().isToBeInstalled() + || poolItem.status().staysUninstalled()) + problemSolution->addSingleAction (poolItem, KEEP); + } + string description = str::form (_("do not install a solvable providing %s"), dep2str(pool, what)); + MIL << description << endl; + problemSolution->setDescription (description); + } break; case SOLVER_ERASE_SOLVABLE_PROVIDES: - MIL << "- do not deinstall all solvables providing " << dep2str(pool, what) << endl; - ERR << "No valid solution available" << endl; + { + Id p, *pp; + FOR_PROVIDES(p, pp, what); + { + PoolItem_Ref poolItem = _pool.find (sat::Solvable(p)); + if (poolItem.status().isToBeUninstalled() + || poolItem.status().staysInstalled()) + problemSolution->addSingleAction (poolItem, KEEP); + } + string description = str::form (_("do not deinstall all solvables providing %s"), dep2str(pool, what)); + MIL << description << endl; + problemSolution->setDescription (description); + } break; case SOLVER_INSTALL_SOLVABLE_UPDATE: - s = pool->solvables + what; - MIL << "- do not install most recent version of " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) - << "." << id2str(pool, s->arch) << endl; - ERR << "No valid solution available" << endl; + { + PoolItem_Ref poolItem = _pool.find (sat::Solvable(what)); + s = pool->solvables + what; + if (poolItem) { + if (solv->installed && s->repo == solv->installed) { + problemSolution->addSingleAction (poolItem, KEEP); + string description = str::form (_("do not install most recent version of %s"), solvable2str(pool, s)); + MIL << description << endl; + problemSolution->setDescription (description); + } else { + ERR << "SOLVER_INSTALL_SOLVABLE_UPDATE " << poolItem << " is not selected for installation" << endl; + } + } else { + ERR << "SOLVER_INSTALL_SOLVABLE_UPDATE: No item found for " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << + id2str(pool, s->arch) << endl; + } + } break; default: MIL << "- do something different" << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8007 - /trunk/zypper/src/zypper-misc.cc
by jkupec＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: jkupec Date: Mon Dec 3 14:12:24 2007 New Revision: 8007 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8007&view=rev Log: - sync pool after commit when in shell Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=80… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Mon Dec 3 14:12:24 2007 @@ -1428,8 +1428,8 @@ //! \todo fix the media reporting correctly gData.show_media_progress_hack = true; - // FIXME do resync if in shell mode, how do I know if in shell mode? - ZYppCommitResult result = God->commit( ZYppCommitPolicy().syncPoolAfterCommit(false) ); + ZYppCommitResult result = God->commit( + ZYppCommitPolicy().syncPoolAfterCommit(zypper.runningShell())); was_installed = true; gData.show_media_progress_hack = false; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8006 - in /branches/tmp/tgoettlicher: updater-kde/ updater-kde_qt4porting/
by tgoettlicher＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: tgoettlicher Date: Mon Dec 3 13:52:59 2007 New Revision: 8006 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8006&view=rev Log: qt4port Added: branches/tmp/tgoettlicher/updater-kde_qt4porting/ - copied from r8005, branches/tmp/tgoettlicher/updater-kde/ Removed: branches/tmp/tgoettlicher/updater-kde/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8005 - in /branches/tmp/tgoettlicher/updater-kde: ./ icons/ updater/ updater/dummy/ updater/dummy_with_packages/ updater/zmd/ updater/zypp/ updater/zypp_traditional/
by tgoettlicher＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: tgoettlicher Date: Mon Dec 3 13:47:02 2007 New Revision: 8005 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8005&view=rev Log: port Added: branches/tmp/tgoettlicher/updater-kde/ - copied from r7990, trunk/updater-kde/ Modified: branches/tmp/tgoettlicher/updater-kde/CMakeLists.txt branches/tmp/tgoettlicher/updater-kde/icons/CMakeLists.txt branches/tmp/tgoettlicher/updater-kde/updater/ConfigWidget.cpp branches/tmp/tgoettlicher/updater-kde/updater/ConfigWidgetUI.ui branches/tmp/tgoettlicher/updater-kde/updater/HeaderWidget.cpp branches/tmp/tgoettlicher/updater-kde/updater/MainWindow.cpp branches/tmp/tgoettlicher/updater-kde/updater/TrayIcon.cpp branches/tmp/tgoettlicher/updater-kde/updater/UpdateListItem.cpp branches/tmp/tgoettlicher/updater-kde/updater/UpdaterApplication.cpp branches/tmp/tgoettlicher/updater-kde/updater/dummy/DummyUpdater.cpp branches/tmp/tgoettlicher/updater-kde/updater/dummy_with_packages/DummyUpdater.cpp branches/tmp/tgoettlicher/updater-kde/updater/progresspopup.cpp branches/tmp/tgoettlicher/updater-kde/updater/simpleview.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdAdvancedConfig.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdCatalogListItem.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdConfigWindow.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdDependencyDialog.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdEditServers.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdInstallWindow.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdProgressDialog.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdRugParser.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdServerDialog.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdateListItem.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdater.cpp branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdaterCore.cpp branches/tmp/tgoettlicher/updater-kde/updater/zypp/CMakeLists.txt branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppListItem.cpp branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppUpdater.cpp branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppUpdaterPreferencesModule.cpp branches/tmp/tgoettlicher/updater-kde/updater/zypp/licensedialog.cpp branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppListItem.cpp branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppUpdaterPreferencesModule.cpp Modified: branches/tmp/tgoettlicher/updater-kde/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde/CMakeLists.txt Mon Dec 3 13:47:02 2007 @@ -3,36 +3,31 @@ SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) -SET ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) -#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "") -SET(CPACK_PACKAGE_VENDOR "Novell Inc.") -#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt") -#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") -SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) -SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) - -SET( CPACK_GENERATOR "TBZ2") -SET( CPACK_SOURCE_GENERATOR "TBZ2") +SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) +SET( CPACK_PACKAGE_VENDOR "Novell Inc." ) +SET( CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} ) +SET( CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR} ) +SET( CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH} ) +SET( CPACK_GENERATOR "TBZ2" ) +SET( CPACK_SOURCE_GENERATOR "TBZ2" ) SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" ) # The following components are regex's to match anywhere (unless anchored) # in absolute path + filename to find files or directories to be excluded # from source tarball. SET (CPACK_SOURCE_IGNORE_FILES -"/CVS/;/.svn/;/.libs/;/.deps/;.swp$;.#;/#;/build/" -"~$" -"\\\\.cvsignore$" -"/package" -"Makefile\\\\.in$" + "/CVS/;/.svn/;/.libs/;/.deps/;.swp$;.#;/#;/build/" + "~$" + "\\\\.cvsignore$" + "/package" + "Makefile\\\\.in$" ) INCLUDE(CPack) -# dont et cmake detect Qt4 uic as Qt3 uic: -SET(ENV{QTDIR} /usr/lib/qt3) -FIND_PACKAGE(KDE3 REQUIRED) -FIND_PACKAGE(KDE3Pim REQUIRED) +SET(QT_QT_INCLUDE_DIR /usr/include/Qt ) +FIND_PACKAGE(KDE4 REQUIRED) +#FIND_PACKAGE(KDE43im REQUIRED) FIND_PACKAGE(Gettext REQUIRED) # Library @@ -46,60 +41,48 @@ ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) -#CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) - -# Get the kde3 dir. This is a bit tricky, i'm not sure how well -# this works on other systems. -STRING(REPLACE "/lib${LIB_SUFFIX}" "" KDE3_DIR ${KDE3_LIB_DIR}) -MESSAGE(STATUS "KDE dir is ${KDE3_DIR}" ) - -# TODO: INSTALL PREFIX. RIGHT NOW EVERYTHING IS INSTALLED IN $KDEDIR if(NOT CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX ${KDE3_DIR}) + set(CMAKE_INSTALL_PREFIX ${BIN_INSTALL_DIR}) endif(NOT CMAKE_INSTALL_PREFIX) -set(KDE3_KCFG_DIR ${CMAKE_INSTALL_PREFIX}/share/config.kcfg) -set(KDE3_SERVICETYPES_DIR ${CMAKE_INSTALL_PREFIX}/share/servicetypes) -set(KDE3_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services) -set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde) -set(KDE3_LIB_INSTALL_DIR ${LIB_INSTALL_DIR} ) -set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/kde3) -set(KDE_UIC_EXECUTABLE /usr/lib/qt3/bin/uic) + +#set(KDE4_SERVICETYPES_DIR ${CMAKE_INSTALL_PREFIX}/share/servicetypes) +#set(KDE4_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services) +#set(KDE4_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde) +#set(KDE4_LIB_INSTALL_DIR ${LIB_INSTALL_DIR} ) +#set(KDE4_PLUGIN_INSTALL_DIR ${KDE4_LIB_INSTALL_DIR}/kde4) +#set(KDE_UIC_EXECUTABLE /usr/lib/qt4/bin/uic) # tell cmake where to search for libraries: -link_directories(${KDE3_LIB_DIR}) +#link_directories(${KDE4_LIB_DIR}) ADD_SUBDIRECTORY( doc ) ADD_SUBDIRECTORY( icons ) ADD_SUBDIRECTORY( images ) -#ADD_SUBDIRECTORY( kxmlrpcclient ) -#ADD_SUBDIRECTORY( kzmdauthutil ) -#ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL ) ADD_SUBDIRECTORY( po ) -#ADD_SUBDIRECTORY( udshttp ) ADD_SUBDIRECTORY( updater ) -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) - -MESSAGE(STATUS "Writing spec file...") -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY) +INCLUDE_DIRECTORIES( ${KDE4_INCLUDES} ) -ADD_CUSTOM_TARGET( svncheck - COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' -) +#MESSAGE(STATUS "Writing spec file...") +#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY) -SET( AUTOBUILD_COMMAND - COMMAND ${CMAKE_MAKE_PROGRAM} package_source - COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package - COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes" -) - -ADD_CUSTOM_TARGET( autobuild_local - ${AUTOBUILD_COMMAND} -) - -ADD_CUSTOM_TARGET( autobuild - COMMAND ${CMAKE_MAKE_PROGRAM} svncheck - ${AUTOBUILD_COMMAND} -) +#ADD_CUSTOM_TARGET( svncheck +# COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' +#) + +#SET( AUTOBUILD_COMMAND +# COMMAND ${CMAKE_MAKE_PROGRAM} package_source +# COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package +# COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 +# COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes" +#) + +#ADD_CUSTOM_TARGET( autobuild_local +# ${AUTOBUILD_COMMAND} +#) + +#ADD_CUSTOM_TARGET( autobuild +# COMMAND ${CMAKE_MAKE_PROGRAM} svncheck +# ${AUTOBUILD_COMMAND} +#) Modified: branches/tmp/tgoettlicher/updater-kde/icons/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/icons/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde/icons/CMakeLists.txt Mon Dec 3 13:47:02 2007 @@ -1,7 +1,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) INSTALL_FILES( /share/apps/opensuseupdater/icons FILES ) -KDE3_INSTALL_ICONS( hicolor ) +KDE4_INSTALL_ICONS( hicolor ) #INSTALL(FILES cr24-app-opensuseupdater_busy.mng # DESTINATION ${KDE3_DIR}/share/icons/hicolor/24x24/apps/ Modified: branches/tmp/tgoettlicher/updater-kde/updater/ConfigWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/ConfigWidget.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/ConfigWidget.cpp Mon Dec 3 13:47:02 2007 @@ -23,15 +23,17 @@ #include <klineedit.h> #include <dcopref.h> #include <qcheckbox.h> +//Added by qt3to4: +#include <Q3VBoxLayout> #include <kcombobox.h> #include <qlayout.h> #include <kparts/componentfactory.h> -#include <qsqlpropertymap.h> +#include <q3sqlpropertymap.h> #include <kapplication.h> #include <qpushbutton.h> #include <qlineedit.h> #include <qmap.h> -#include <qtextedit.h> +#include <q3textedit.h> #include "opensuseupdater_settings.h" #include "ConfigWidget.h" @@ -45,7 +47,7 @@ setName("ConfigWidget"); } - QVBoxLayout *layout = new QVBoxLayout(BackendFrame); + Q3VBoxLayout *layout = new Q3VBoxLayout(BackendFrame); comboBackendPlugin = new QComboBox(BackendFrame, "BackendPlugin"); kcfg_BackendPlugin = new QLineEdit(BackendFrame, "kcfg_BackendPlugin"); layout->add(comboBackendPlugin); Modified: branches/tmp/tgoettlicher/updater-kde/updater/ConfigWidgetUI.ui URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/ConfigWidgetUI.ui (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/ConfigWidgetUI.ui Mon Dec 3 13:47:02 2007 @@ -1,154 +1,144 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>ConfigWidgetUI</class> -<widget class="QWidget"> - <property name="name"> - <cstring>ConfigWidgetUI</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>600</width> - <height>166</height> - </rect> - </property> - - <vbox> - <hbox> - <widget class="QLabel"> - <property name="text"> - <string>Check for updates every:</string> - </property> - <property name="name"> - <cstring>l1</cstring> - </property> - - </widget> - - <widget class="QSpinBox"> - <property name="name"> - <cstring>kcfg_Interval</cstring> - </property> - <property name="suffix"> - <string> Hours</string> - </property> - <property name="minValue"> - <number>1</number> - </property> - </widget> - </hbox> - - <hbox> - <widget class="QLabel"> - <property name="text"> - <string>Show recurring notification when updates are available every:</string> - </property> - <property name="name"> - <cstring>l2</cstring> - </property> - - </widget> - - <widget class="QSpinBox"> - <property name="name"> - <cstring>kcfg_WarnInterval</cstring> - </property> - <property name="suffix"> - <string> Minutes</string> - </property> - <property name="minValue"> - <number>0</number> - </property> - <property name="maxValue"> - <number>720</number> - </property> - - </widget> - </hbox> - - - <hbox> - <widget class="QLabel"> - <property name="text"> - <string>Backend:</string> - </property> - <property name="name"> - <cstring>l3</cstring> - </property> - </widget> - - <hbox> - <widget class="QFrame" row="1" column="1"> - <property name="name"> - <cstring>BackendFrame</cstring> - </property> - <property name="frameShape"> - <enum>NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>Plain</enum> - </property> - </widget> - <widget class="QLabel"> - <property name="text"> - <string></string> - </property> - <property name="name"> - <cstring>l4</cstring> - </property> - </widget> - </hbox> - </hbox> - - <widget class="QCheckBox"> - <property name="name"> - <cstring>kcfg_Autostart</cstring> - </property> - <property name="text"> - <string>Automa&tically start updater on login</string> - </property> - </widget> - - <widget class="QCheckBox"> - <property name="name"> - <cstring>kcfg_ShowPackages</cstring> - </property> - <property name="text"> - <string>Show available upgrades when backend provides them (for experts only)</string> - </property> - </widget> - - - - <widget class="QCheckBox"> - <property name="name"> - <cstring>kcfg_ShowNotifications</cstring> - </property> - <property name="text"> - <string>Show notifications</string> - </property> - </widget> - - <widget class="QCheckBox"> - <property name="name"> - <cstring>kcfg_NoSimpleView</cstring> - </property> - <property name="text"> - <string>Always show detailed view</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>kcfg_CheckingAnimation</cstring> - </property> - <property name="text"> - <string>Animated icon on check</string> - </property> - </widget> - - - - </vbox> -</widget> -<layoutdefaults spacing="6" margin="11"/> -</UI> +<ui version="4.0" stdsetdef="1" > + <author></author> + <comment></comment> + <exportmacro></exportmacro> + <class>ConfigWidgetUI</class> + <widget class="QWidget" name="ConfigWidgetUI" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>600</width> + <height>166</height> + </rect> + </property> + <layout class="QVBoxLayout" > + <item> + <layout class="QHBoxLayout" > + <item> + <widget class="QLabel" name="l1" > + <property name="text" > + <string>Check for updates every:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="kcfg_Interval" > + <property name="suffix" > + <string> Hours</string> + </property> + <property name="minimum" > + <number>1</number> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" > + <item> + <widget class="QLabel" name="l2" > + <property name="text" > + <string>Show recurring notification when updates are available every:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="kcfg_WarnInterval" > + <property name="suffix" > + <string> Minutes</string> + </property> + <property name="minimum" > + <number>0</number> + </property> + <property name="maximum" > + <number>720</number> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" > + <item> + <widget class="QLabel" name="l3" > + <property name="text" > + <string>Backend:</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" > + <item row="1" column="1" > + <widget class="Q3Frame" name="BackendFrame" > + <property name="frameShape" > + <enum>NoFrame</enum> + </property> + <property name="frameShadow" > + <enum>Plain</enum> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="l4" > + <property name="text" > + <string/> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="kcfg_Autostart" > + <property name="text" > + <string>Automa&tically start updater on login</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="kcfg_ShowPackages" > + <property name="text" > + <string>Show available upgrades when backend provides them (for experts only)</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="kcfg_ShowNotifications" > + <property name="text" > + <string>Show notifications</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="kcfg_NoSimpleView" > + <property name="text" > + <string>Always show detailed view</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="kcfg_CheckingAnimation" > + <property name="text" > + <string>Animated icon on check</string> + </property> + </widget> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11" /> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> +</ui> Modified: branches/tmp/tgoettlicher/updater-kde/updater/HeaderWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/HeaderWidget.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/HeaderWidget.cpp Mon Dec 3 13:47:02 2007 @@ -24,12 +24,15 @@ #include <qlabel.h> #include <qlayout.h> +//Added by qt3to4: +#include <QPixmap> +#include <Q3GridLayout> #include "Constants.h" HeaderWidget::HeaderWidget(QWidget *parent) : QWidget(parent) { // layout = new QHBoxLayout(this); - layout = new QGridLayout(this); + layout = new Q3GridLayout(this); suseLogo = new QLabel(this); text = new QLabel(this, "headline", Qt::SingleLine); pic = new QPixmap(KGlobal::iconLoader()->loadIcon(PROGRAM_ICON, KIcon::Panel, KIcon::SizeHuge)); Modified: branches/tmp/tgoettlicher/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/MainWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/MainWindow.cpp Mon Dec 3 13:47:02 2007 @@ -21,6 +21,9 @@ #include <kiconloader.h> #include <qtabwidget.h> +//Added by qt3to4: +#include <Q3HBoxLayout> +#include <Q3VBoxLayout> #include <kaction.h> #include <kstdaction.h> #include <klocale.h> @@ -36,7 +39,7 @@ #include <connectionmanager.h> #include <networkstatuscommon.h> -#include <qlistview.h> +#include <q3listview.h> #include <qlabel.h> #include <qtimer.h> #include <qlayout.h> @@ -118,7 +121,7 @@ KIconLoader *loader = KGlobal::iconLoader(); setIcon(loader->loadIcon(PROGRAM_NAME, KIcon::Small)); - mainBox = new QVBoxLayout(centralWidget); + mainBox = new Q3VBoxLayout(centralWidget); header = new HeaderWidget(centralWidget); // ------[ Patches - Tab ]--- @@ -129,17 +132,17 @@ patchWidget = new QWidget(centralWidget); patchLabel = new QLabel(patchWidget); patchLabel->setText(i18n("The following official patches for openSUSE either fix security holes or errors in the software.")); - patchList = new QListView(patchWidget); - patchList->setSelectionMode ( QListView::NoSelection ); + patchList = new Q3ListView(patchWidget); + patchList->setSelectionMode ( Q3ListView::NoSelection ); patchList->addColumn(i18n("Name")); - patchList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); + patchList->setColumnWidthMode(COLUMN_NAME, Q3ListView::Maximum); patchList->addColumn(i18n("Summary")); patchList->addColumn(i18n("Type")); patchList->addColumn(i18n("New Version")); patchList->addColumn(i18n("Catalog")); patchList->addColumn(i18n("Restart")); patchList->addColumn("RestartHidden",0); - QVBoxLayout *patchBox = new QVBoxLayout(patchWidget); + Q3VBoxLayout *patchBox = new Q3VBoxLayout(patchWidget); patchDescription = new KTextEdit(patchWidget); patchDescription->setReadOnly(true); tabwidget->addTab(patchWidget, i18n("Patches")); @@ -150,7 +153,7 @@ patchSelectAllButton = new KPushButton(i18n("Select All Patches"), patchWidget); patchClearSelectionButton = new KPushButton(i18n("Clear Patch Selection"), patchWidget); - patchSelectionButtonsLayout = new QHBoxLayout(patchBox); + patchSelectionButtonsLayout = new Q3HBoxLayout(patchBox); patchSelectionButtonsLayout->addWidget(patchSelectAllButton, false, Qt::AlignLeft); patchSelectionButtonsLayout->addWidget(patchClearSelectionButton, false, Qt::AlignRight); @@ -168,10 +171,10 @@ packageLabel = new QLabel(packageWidget); packageLabel->setText(i18n("The following list contains new versions for software packages installed on your system. " "These updates are provided by the openSUSE community.")); - packageList = new QListView(packageWidget); - packageList->setSelectionMode ( QListView::NoSelection ); + packageList = new Q3ListView(packageWidget); + packageList->setSelectionMode ( Q3ListView::NoSelection ); packageList->addColumn(i18n("Name")); - packageList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); + packageList->setColumnWidthMode(COLUMN_NAME, Q3ListView::Maximum); packageList->addColumn(i18n("Summary")); packageList->addColumn(i18n("Type")); packageList->addColumn(i18n("New Version")); @@ -179,7 +182,7 @@ packageList->addColumn(i18n("Restart")); packageList->addColumn("RestartHidden",0); - QVBoxLayout *packageBox = new QVBoxLayout(packageWidget); + Q3VBoxLayout *packageBox = new Q3VBoxLayout(packageWidget); packageDescription = new KTextEdit(packageWidget); packageDescription->setReadOnly(true); packageBox->addWidget(packageLabel,0,0); @@ -188,7 +191,7 @@ packageSelectAllButton = new KPushButton(i18n("Select All Packages"), packageWidget); packageClearSelectionButton = new KPushButton(i18n("Clear Package Selection"), packageWidget); - packageSelectionButtonsLayout = new QHBoxLayout(packageBox); + packageSelectionButtonsLayout = new Q3HBoxLayout(packageBox); packageSelectionButtonsLayout->addWidget(packageSelectAllButton, false, Qt::AlignLeft); packageSelectionButtonsLayout->addWidget(packageClearSelectionButton, false, Qt::AlignRight); @@ -202,7 +205,7 @@ mainBox->addWidget(header, 0, 0); mainBox->addWidget(tabwidget, 0, 0); - buttonsLayout = new QHBoxLayout(mainBox); + buttonsLayout = new Q3HBoxLayout(mainBox); configureButton = new KPushButton(i18n("Add/Remove Update Repositories..."), centralWidget); installButton = new KPushButton(KStdGuiItem::ok(), centralWidget); @@ -233,10 +236,10 @@ connect(patchClearSelectionButton, SIGNAL(clicked()), this, SLOT(patchClearButtonClicked())); connect(packageClearSelectionButton, SIGNAL(clicked()), this, SLOT(packageClearButtonClicked())); - connect(patchList, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotPatchSelected(QListViewItem*))); - connect(packageList, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotPackageSelected(QListViewItem*))); - connect(patchList, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotPatchClicked(QListViewItem*))); - connect(packageList, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotPackageClicked(QListViewItem*))); + connect(patchList, SIGNAL(selectionChanged(Q3ListViewItem*)), this, SLOT(slotPatchSelected(Q3ListViewItem*))); + connect(packageList, SIGNAL(selectionChanged(Q3ListViewItem*)), this, SLOT(slotPackageSelected(Q3ListViewItem*))); + connect(patchList, SIGNAL(clicked(Q3ListViewItem*)), this, SLOT(slotPatchClicked(Q3ListViewItem*))); + connect(packageList, SIGNAL(clicked(Q3ListViewItem*)), this, SLOT(slotPackageClicked(Q3ListViewItem*))); connect(patchList, SIGNAL(selectionChanged()), this, SLOT(slotPatchSelectionChanged())); connect(packageList, SIGNAL(selectionChanged()), this, SLOT(slotPackageSelectionChanged())); @@ -253,23 +256,23 @@ void MainWindow::updateButtons() { patchesSelected=0; - QCheckListItem *patchitem = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *patchitem = (Q3CheckListItem*)patchList->firstChild(); while (patchitem != NULL) { if (patchitem->isOn()) patchesSelected++; - patchitem = (QCheckListItem*)patchitem->nextSibling(); + patchitem = (Q3CheckListItem*)patchitem->nextSibling(); } packagesSelected=0; - QCheckListItem *packageitem = (QCheckListItem*)packageList->firstChild(); + Q3CheckListItem *packageitem = (Q3CheckListItem*)packageList->firstChild(); while (packageitem != NULL) { if (packageitem->isOn()) packagesSelected++; - packageitem = (QCheckListItem*)packageitem->nextSibling(); + packageitem = (Q3CheckListItem*)packageitem->nextSibling(); } // when updates are selected for installation, enable "Install" button @@ -578,13 +581,13 @@ void MainWindow::patchSelectButtonClicked() { - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if (!item->isOn()) { - item->setState(QCheckListItem::On); + item->setState(Q3CheckListItem::On); } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } patchesSelected = patchList->childCount(); @@ -593,14 +596,14 @@ void MainWindow::packageSelectButtonClicked() { - QCheckListItem *item = (QCheckListItem*)packageList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)packageList->firstChild(); while (item != NULL) { if (!item->isOn()) { - item->setState(QCheckListItem::On); + item->setState(Q3CheckListItem::On); item->setSelected(true); } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } packagesSelected = packageList->childCount(); @@ -609,14 +612,14 @@ void MainWindow::patchClearButtonClicked() { - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if (item->isOn()) { - item->setState(QCheckListItem::Off); + item->setState(Q3CheckListItem::Off); item->setSelected(false); } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } patchesSelected = 0; updateButtons(); @@ -628,21 +631,21 @@ if ( _caps.canSelectIndividualUpdates == false ) return; - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if (item->text(COLUMN_TYPE).lower() == "security" || item->text(COLUMN_TYPE).lower() == "packagemanager" ) { - item->setState(QCheckListItem::On); + item->setState(Q3CheckListItem::On); item->setSelected(true); } else { - item->setState(QCheckListItem::Off); + item->setState(Q3CheckListItem::Off); item->setSelected(false); } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } updateButtons(); @@ -656,16 +659,16 @@ { if ( _caps.canSelectIndividualUpdates == false ) return; - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if (item->text(COLUMN_TYPE).lower() == "recommended" || item->text(COLUMN_TYPE).lower() == "packagemanager" ) { - item->setState(QCheckListItem::On); + item->setState(Q3CheckListItem::On); item->setSelected(true); } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } updateButtons(); @@ -678,7 +681,7 @@ { int count=0; - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if ((item->text(COLUMN_TYPE).lower() == "recommended" || @@ -686,7 +689,7 @@ (!onlySelected || item->isOn())) count++; - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } return count; } @@ -695,14 +698,14 @@ { int count=0; - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if (item->text(COLUMN_TYPE).lower() == "security" && (!onlySelected || item->isOn() ) ) count++; - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } return count; } @@ -711,14 +714,14 @@ { int count=0; - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if (item->text(COLUMN_RESTART_HIDDEN).lower() == "restart" && (!onlySelected || item->isOn())) count++; - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } return count; } @@ -728,16 +731,16 @@ if ( _caps.canSelectIndividualUpdates == false ) return; - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if (item->text(COLUMN_RESTART_HIDDEN).lower() == "restart" && item->text(COLUMN_TYPE).lower() != "packagemanager" ) { - item->setState(QCheckListItem::Off); + item->setState(Q3CheckListItem::Off); item->setSelected(false); } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } updateButtons(); @@ -748,13 +751,13 @@ void MainWindow::packageClearButtonClicked() { - QCheckListItem *item = (QCheckListItem*)packageList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)packageList->firstChild(); while (item != NULL) { if (item->isOn()) { - item->setState(QCheckListItem::Off); + item->setState(Q3CheckListItem::Off); } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } packagesSelected = 0; updateButtons(); @@ -808,13 +811,13 @@ } //Selection/Fetch Description slots -void MainWindow::slotPackageSelected(QListViewItem *package) +void MainWindow::slotPackageSelected(Q3ListViewItem *package) { updateButtons(); emit(resolvableSelected(package, RESOLVABLE_PACKAGE)); } -void MainWindow::slotPatchSelected(QListViewItem *patch) +void MainWindow::slotPatchSelected(Q3ListViewItem *patch) { updateButtons(); emit(resolvableSelected(patch, RESOLVABLE_PATCH)); @@ -824,13 +827,13 @@ patchesSelected = 0; - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { if (item->isOn()) { patchesSelected++; } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } updateButtons(); @@ -840,25 +843,25 @@ packagesSelected = 0; - QCheckListItem *item = (QCheckListItem*)packageList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)packageList->firstChild(); while (item != NULL) { if (item->isOn()) { packagesSelected++; } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } updateButtons(); } -void MainWindow::slotPackageClicked(QListViewItem *pack) +void MainWindow::slotPackageClicked(Q3ListViewItem *pack) { emit(resolvableSelected(pack, RESOLVABLE_PACKAGE)); updateButtons(); } -void MainWindow::slotPatchClicked(QListViewItem *pack) +void MainWindow::slotPatchClicked(Q3ListViewItem *pack) { emit(resolvableSelected(pack, RESOLVABLE_PATCH)); updateButtons(); Modified: branches/tmp/tgoettlicher/updater-kde/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/TrayIcon.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/TrayIcon.cpp Mon Dec 3 13:47:02 2007 @@ -22,6 +22,9 @@ #include <kpassivepopup.h> #include <klocale.h> #include <qlayout.h> +//Added by qt3to4: +#include <Q3HBoxLayout> +#include <QLabel> #include <kdialog.h> #include <qtimer.h> @@ -47,7 +50,7 @@ // construct notification popup popup = new KPassivePopup(this); QWidget *popupWidget = new QWidget(popup); - QHBoxLayout *vb = new QHBoxLayout(popupWidget); + Q3HBoxLayout *vb = new Q3HBoxLayout(popupWidget); QLabel *iconLabel = new QLabel(popupWidget); QLabel *description = new QLabel(popupWidget); description->setText(i18n("New software for your system is available")); Modified: branches/tmp/tgoettlicher/updater-kde/updater/UpdateListItem.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/UpdateListItem.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/UpdateListItem.cpp Mon Dec 3 13:47:02 2007 @@ -19,8 +19,8 @@ #include "UpdateListItem.h" -UpdateListItem::UpdateListItem( QListView *parent, const QString &text ) - : QListViewItem(parent, text ) +UpdateListItem::UpdateListItem( Q3ListView *parent, const QString &text ) + : Q3ListViewItem(parent, text ) { } Modified: branches/tmp/tgoettlicher/updater-kde/updater/UpdaterApplication.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/UpdaterApplication.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/UpdaterApplication.cpp Mon Dec 3 13:47:02 2007 @@ -261,13 +261,13 @@ connect(_main, SIGNAL(configureUpdater()), updater, SLOT(configureUpdater())); //Start update list populate, makes backend check for updates - connect(_main, SIGNAL(populateLists(QListView*, QListView*, bool)), updater, SLOT(populateLists(QListView*, QListView*, bool))); + connect(_main, SIGNAL(populateLists(Q3ListView*, Q3ListView*, bool)), updater, SLOT(populateLists(Q3ListView*, Q3ListView*, bool))); //Signal to inform the mainwindow of new updates in the list connect(updater, SIGNAL(populateDone()), _main, SLOT(populateDone())); //Signals to get backend to put together a description for selected update and to return that description - connect(_main, SIGNAL(resolvableSelected(QListViewItem*, int)), updater, SLOT(resolvableSelected(QListViewItem*, int))); + connect(_main, SIGNAL(resolvableSelected(Q3ListViewItem*, int)), updater, SLOT(resolvableSelected(Q3ListViewItem*, int))); connect(updater, SIGNAL(returnDescription(QString,int)), _main, SLOT(gotDescription(QString,int))); //Signal to tell the backend to show a menu at the specified position Modified: branches/tmp/tgoettlicher/updater-kde/updater/dummy/DummyUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/dummy/DummyUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/dummy/DummyUpdater.cpp Mon Dec 3 13:47:02 2007 @@ -24,10 +24,10 @@ #include <sys/types.h> #include <fcntl.h> -#include <qptrlist.h> -#include <qlistview.h> +#include <q3ptrlist.h> +#include <q3listview.h> #include <qobject.h> -#include <qpopupmenu.h> +#include <q3popupmenu.h> #include <qtimer.h> #include <kglobal.h> @@ -109,18 +109,18 @@ int patchcount=2; - QCheckListItem *newItem; - QCheckListItem *newItem2; - QCheckListItem *newItemA; + Q3CheckListItem *newItem; + Q3CheckListItem *newItem2; + Q3CheckListItem *newItemA; - newItem = new QCheckListItem(_patchList, "HALLO", QCheckListItem::CheckBox); + newItem = new Q3CheckListItem(_patchList, "HALLO", Q3CheckListItem::CheckBox); newItem->setText(COLUMN_NAME, "Dummy-Program: Fixes nothing since this is an example"); newItem->setText(COLUMN_TYPE, "Dummy-Patch"); newItem->setText(COLUMN_NEW_VERSION, "42" ); newItem->setText(COLUMN_CATALOG, "Dummy-Source" ); - newItem2 = new QCheckListItem(_patchList, "HALLO", QCheckListItem::CheckBox); + newItem2 = new Q3CheckListItem(_patchList, "HALLO", Q3CheckListItem::CheckBox); newItem2->setText(COLUMN_NAME, "Dummy-Program: Fixes nothing too"); newItem2->setText(COLUMN_TYPE, "Dummy-Patch"); @@ -129,7 +129,7 @@ - newItemA = new QCheckListItem(_packageList, "HALLO", QCheckListItem::CheckBox); + newItemA = new Q3CheckListItem(_packageList, "HALLO", Q3CheckListItem::CheckBox); newItemA->setText(COLUMN_NAME, "Dummy-Program: stupid"); newItemA->setText(COLUMN_TYPE, "Dummy-Package"); @@ -174,7 +174,7 @@ } -void DummyUpdater::populateLists(QListView *patchList, QListView *packageList) +void DummyUpdater::populateLists(Q3ListView *patchList, Q3ListView *packageList) { kdDebug() << "got populate UI request..." << endl; _patchList = patchList; @@ -211,7 +211,7 @@ } -void DummyUpdater::resolvableSelected(QListViewItem *item, int resolvableType) +void DummyUpdater::resolvableSelected(Q3ListViewItem *item, int resolvableType) { // retrieve description kdDebug() << "updating item" << endl; Modified: branches/tmp/tgoettlicher/updater-kde/updater/dummy_with_packages/DummyUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/dummy_with_packages/DummyUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/dummy_with_packages/DummyUpdater.cpp Mon Dec 3 13:47:02 2007 @@ -24,10 +24,10 @@ #include <sys/types.h> #include <fcntl.h> -#include <qptrlist.h> -#include <qlistview.h> +#include <q3ptrlist.h> +#include <q3listview.h> #include <qobject.h> -#include <qpopupmenu.h> +#include <q3popupmenu.h> #include <qtimer.h> #include <kglobal.h> @@ -111,18 +111,18 @@ int patchcount=2; int packagecount=1; - QCheckListItem *newItem; - QCheckListItem *newItem2; - QCheckListItem *newItemA; + Q3CheckListItem *newItem; + Q3CheckListItem *newItem2; + Q3CheckListItem *newItemA; - newItem = new QCheckListItem(_patchList, "HALLO", QCheckListItem::CheckBox); + newItem = new Q3CheckListItem(_patchList, "HALLO", Q3CheckListItem::CheckBox); newItem->setText(COLUMN_NAME, "Dummy-Program: Fixes nothing since this is an example"); newItem->setText(COLUMN_TYPE, "Dummy-Patch"); newItem->setText(COLUMN_NEW_VERSION, "42" ); newItem->setText(COLUMN_CATALOG, "Dummy-Source" ); - newItem2 = new QCheckListItem(_patchList, "HALLO", QCheckListItem::CheckBox); + newItem2 = new Q3CheckListItem(_patchList, "HALLO", Q3CheckListItem::CheckBox); newItem2->setText(COLUMN_NAME, "Dummy-Program: Fixes nothing too"); newItem2->setText(COLUMN_TYPE, "Dummy-Patch"); @@ -131,7 +131,7 @@ - newItemA = new QCheckListItem(_packageList, "HALLO", QCheckListItem::CheckBox); + newItemA = new Q3CheckListItem(_packageList, "HALLO", Q3CheckListItem::CheckBox); newItemA->setText(COLUMN_NAME, "Dummy-Program: stupid"); newItemA->setText(COLUMN_TYPE, "Dummy-Package"); @@ -176,7 +176,7 @@ } -void DummyUpdater::populateLists(QListView *patchList, QListView *packageList) +void DummyUpdater::populateLists(Q3ListView *patchList, Q3ListView *packageList) { kdDebug() << "got populate UI request..." << endl; _patchList = patchList; @@ -213,7 +213,7 @@ } -void DummyUpdater::resolvableSelected(QListViewItem *item, int resolvableType) +void DummyUpdater::resolvableSelected(Q3ListViewItem *item, int resolvableType) { // retrieve description kdDebug() << "updating item" << endl; Modified: branches/tmp/tgoettlicher/updater-kde/updater/progresspopup.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/progresspopup.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/progresspopup.cpp Mon Dec 3 13:47:02 2007 @@ -2,7 +2,10 @@ #include <kdebug.h> #include <qlayout.h> #include <qlabel.h> -#include <qprogressbar.h> +#include <q3progressbar.h> +//Added by qt3to4: +#include <Q3GridLayout> +#include <QPixmap> #include <klocale.h> #include <qimage.h> #include <kiconloader.h> @@ -14,10 +17,10 @@ setTimeout(0); QWidget *widget = new QWidget(this); - QGridLayout *layout = new QGridLayout(widget); + Q3GridLayout *layout = new Q3GridLayout(widget); QLabel *captionLabel = new QLabel(widget); packageLabel = new QLabel(widget); - bar = new QProgressBar(widget); + bar = new Q3ProgressBar(widget); bar->setProgress(0,100); QLabel *logo = new QLabel(widget); QPixmap *pic = new QPixmap(KGlobal::iconLoader()->loadIcon(PROGRAM_ICON, KIcon::Panel, KIcon::SizeLarge)); Modified: branches/tmp/tgoettlicher/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/simpleview.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/simpleview.cpp Mon Dec 3 13:47:02 2007 @@ -2,11 +2,15 @@ #include <qcheckbox.h> #include <qlayout.h> #include <qlabel.h> +//Added by qt3to4: +#include <QShowEvent> +#include <Q3GridLayout> +#include <QPixmap> #include <kglobal.h> #include "Constants.h" #include <kiconloader.h> #include <klocale.h> -#include <qframe.h> +#include <q3frame.h> #include <qpushbutton.h> #include <qlayout.h> #include <qnamespace.h> @@ -14,7 +18,7 @@ #include <kdebug.h> #include <kpushbutton.h> #include <qtimer.h> -#include <qtextbrowser.h> +#include <q3textbrowser.h> #include "Updater.h" #include "UpdaterCapabilities.h" @@ -26,7 +30,7 @@ QWidget *centralWidget = new QWidget( this ); setCentralWidget( centralWidget ); - QGridLayout *layout = new QGridLayout(centralWidget); + Q3GridLayout *layout = new Q3GridLayout(centralWidget); layout->setSpacing(5); layout->setMargin(10); @@ -48,7 +52,7 @@ title = new QLabel(centralWidget); title->setText(i18n("Choose the updates to be installed:")); - textBrowser = new QTextBrowser( centralWidget); + textBrowser = new Q3TextBrowser( centralWidget); recommended = new QCheckBox(i18n("Install %n recommended update additionally", "Install %n recommended updates additionally", 0), centralWidget); @@ -62,7 +66,7 @@ norestart = new QCheckBox(i18n("Don't install updates that require a restart"), centralWidget); - bar = new QProgressBar(centralWidget); + bar = new Q3ProgressBar(centralWidget); layout->addMultiCellWidget(title,1,1,1,3); Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdAdvancedConfig.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdAdvancedConfig.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdAdvancedConfig.cpp Mon Dec 3 13:47:02 2007 @@ -27,14 +27,16 @@ #include <kconfig.h> #include <qradiobutton.h> -#include <qprocess.h> +#include <q3process.h> #include <qcombobox.h> #include <qspinbox.h> #include <qlabel.h> #include <qlayout.h> #include <qhbuttongroup.h> -#include <qhbox.h> -#include <qvgroupbox.h> +#include <q3hbox.h> +#include <q3vgroupbox.h> +//Added by qt3to4: +#include <Q3GridLayout> #include "ZmdRugParser.h" #include "ZmdUpdaterCore.h" @@ -62,7 +64,7 @@ parser = new ZmdRugParser(this); saveProc = NULL; - proc = new QProcess(QString("rug"), this); + proc = new Q3Process(QString("rug"), this); proc->addArgument("get-prefs"); connect(proc, SIGNAL(processExited()), @@ -78,19 +80,19 @@ void ZmdAdvancedConfig::initGUI() { - mainLayout = new QGridLayout(this, 2, 2); + mainLayout = new Q3GridLayout(this, 2, 2); //Connection stuff - connectionBox = new QVGroupBox(this); + connectionBox = new Q3VGroupBox(this); connectionBox->setTitle(i18n("Connection Options")); - QHBox *hostBox = new QHBox(connectionBox); + Q3HBox *hostBox = new Q3HBox(connectionBox); hostLabel = new QLabel(i18n("ZMD Is Listening on: "), hostBox); hostEdit = new KLineEdit(hostBox); - QHBox *remoteBox = new QHBox(connectionBox); + Q3HBox *remoteBox = new Q3HBox(connectionBox); remoteLabel = new QLabel(i18n("ZMD TCP Support: "), remoteBox); - remoteButtons = new QHButtonGroup(remoteBox); + remoteButtons = new Q3HButtonGroup(remoteBox); QRadioButton *onButton = new QRadioButton(i18n("On"), remoteButtons); QRadioButton *offButton = new QRadioButton(i18n("Off"), remoteButtons); @@ -99,12 +101,12 @@ onButton = offButton = 0; //Security stuff - securityBox = new QVGroupBox(this); + securityBox = new Q3VGroupBox(this); securityBox->setTitle(i18n("Security Options")); - QHBox *certBox = new QHBox(securityBox); + Q3HBox *certBox = new Q3HBox(securityBox); certLabel = new QLabel(i18n("Require GPG Certificates For Servers: "), certBox); - certButtons = new QHButtonGroup(certBox); + certButtons = new Q3HButtonGroup(certBox); onButton = new QRadioButton(i18n("Yes"), certButtons); offButton = new QRadioButton(i18n("No"), certButtons); @@ -112,37 +114,37 @@ certButtons->insert(offButton,CERT_BUTTON_NO); onButton = offButton = 0; - QHBox *secLevBox = new QHBox(securityBox); + Q3HBox *secLevBox = new Q3HBox(securityBox); securityLevelLabel = new QLabel(i18n("Security Level: "), secLevBox); securityLevelBox = new QComboBox(false, secLevBox); //Proxy stuff - proxyBox = new QVGroupBox(this); + proxyBox = new Q3VGroupBox(this); proxyBox->setTitle(i18n("Proxy Options")); - QHBox *urlBox = new QHBox(proxyBox); + Q3HBox *urlBox = new Q3HBox(proxyBox); proxyUrlLabel = new QLabel(i18n("Proxy Server:"), urlBox); proxyUrlEdit = new KLineEdit(urlBox); - QHBox *userBox = new QHBox(proxyBox); + Q3HBox *userBox = new Q3HBox(proxyBox); proxyUsernameLabel = new QLabel(i18n("User Name:"), userBox); proxyUsernameEdit = new KLineEdit(userBox); - QHBox *passBox = new QHBox(proxyBox); + Q3HBox *passBox = new Q3HBox(proxyBox); proxyPasswordLabel = new QLabel(i18n("Password:"), passBox); proxyPasswordEdit = new KLineEdit(passBox); //"Other" stuff - otherBox = new QVGroupBox(this); + otherBox = new Q3VGroupBox(this); otherBox->setTitle(i18n("Other Options")); - QHBox *logLevelBox = new QHBox(otherBox); + Q3HBox *logLevelBox = new Q3HBox(otherBox); logLabel = new QLabel(i18n("ZMD Logging Level: "), logLevelBox); logBox = new QComboBox(false, logLevelBox); - QHBox *rollbackBox = new QHBox(otherBox); + Q3HBox *rollbackBox = new Q3HBox(otherBox); rollbackLabel = new QLabel(i18n("Rollback Support: "), rollbackBox); - rollbackButtons = new QHButtonGroup(rollbackBox); + rollbackButtons = new Q3HButtonGroup(rollbackBox); onButton = new QRadioButton(i18n("On"), rollbackButtons); offButton = new QRadioButton(i18n("Off"), rollbackButtons); @@ -150,7 +152,7 @@ rollbackButtons->insert(offButton, ROLLBACK_BUTTON_OFF); onButton = offButton = 0; - QHBox *downloadsBox = new QHBox(otherBox); + Q3HBox *downloadsBox = new Q3HBox(otherBox); maxDownloadsLabel = new QLabel(i18n("Max Simultaneous Downloads"), downloadsBox); maxDownloadsSpinner = new QSpinBox(downloadsBox); @@ -347,7 +349,7 @@ kdWarning() << setting << " " << value << endl; #endif - saveProc = new QProcess(QString("rug"), this); + saveProc = new Q3Process(QString("rug"), this); saveProc->addArgument("set-prefs"); saveProc->addArgument(setting); saveProc->addArgument(value); @@ -528,7 +530,7 @@ if (restartZMDOnExit == true) { - proc = new QProcess(QString("rug"), this); + proc = new Q3Process(QString("rug"), this); proc->addArgument("restart"); proc->start(); kdWarning() << "Restarting ZMD" << endl; Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdCatalogListItem.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdCatalogListItem.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdCatalogListItem.cpp Mon Dec 3 13:47:02 2007 @@ -22,12 +22,12 @@ #include <kdebug.h> -ZmdCatalogListItem::ZmdCatalogListItem( QListViewItem *parent, +ZmdCatalogListItem::ZmdCatalogListItem( Q3ListViewItem *parent, const QString &text, ZmdUpdaterCore *_core) : - QCheckListItem( parent, + Q3CheckListItem( parent, text, - QCheckListItem::CheckBox), + Q3CheckListItem::CheckBox), core(_core) { @@ -48,10 +48,10 @@ //Deal with tristate, even when we disable this switch (this->state()) { - case QCheckListItem::Off: + case Q3CheckListItem::Off: core->unsubscribeCatalog(cat); break; - case QCheckListItem::On: + case Q3CheckListItem::On: core->subscribeCatalog(cat); break; } Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdConfigWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdConfigWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdConfigWindow.cpp Mon Dec 3 13:47:02 2007 @@ -25,6 +25,8 @@ #include <qlayout.h> #include <qtabwidget.h> +//Added by qt3to4: +#include <Q3VBoxLayout> #include "ZmdEditServers.h" #include "ZmdAdvancedConfig.h" @@ -49,7 +51,7 @@ void ZmdConfigWindow::initGUI() { - mainLayout = new QVBoxLayout(this); + mainLayout = new Q3VBoxLayout(this); header = new HeaderWidget(this); tabs = new QTabWidget(this); editServers = new ZmdEditServers(core, tabs); Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdDependencyDialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdDependencyDialog.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdDependencyDialog.cpp Mon Dec 3 13:47:02 2007 @@ -25,6 +25,9 @@ #include <qlabel.h> #include <qlayout.h> +//Added by qt3to4: +#include <Q3VBoxLayout> +#include <Q3HBoxLayout> ZmdDependencyDialog::ZmdDependencyDialog(QWidget *parent) : QDialog(parent) { @@ -35,7 +38,7 @@ void ZmdDependencyDialog::initGUI() { - mainLayout = new QVBoxLayout(this); + mainLayout = new Q3VBoxLayout(this); okButton = new KPushButton(KStdGuiItem::ok(), this); cancelButton = new KPushButton(KStdGuiItem::cancel(), this); packages = new KTextEdit(this); @@ -43,7 +46,7 @@ mainLayout->addWidget(packages); packages->setReadOnly(true); - buttonLayout = new QHBoxLayout(mainLayout); + buttonLayout = new Q3HBoxLayout(mainLayout); buttonLayout->setSpacing(5); buttonLayout->addWidget(okButton, 0, Qt::AlignCenter); buttonLayout->addWidget(cancelButton, 0, Qt::AlignCenter); Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdEditServers.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdEditServers.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdEditServers.cpp Mon Dec 3 13:47:02 2007 @@ -23,6 +23,10 @@ #include <kdebug.h> #include <qlayout.h> +//Added by qt3to4: +#include <Q3HBoxLayout> +#include <Q3VBoxLayout> +#include <Q3ValueList> #include "ZmdConfigWindow.h" #include "ZmdEditServers.h" @@ -48,31 +52,31 @@ void ZmdEditServers::initGUI() { - mainLayout = new QVBoxLayout(this); - serverList = new QListView(this); + mainLayout = new Q3VBoxLayout(this); + serverList = new Q3ListView(this); addButton = new KPushButton(i18n("Add Server"), this); removeButton = new KPushButton(i18n("Remove Server"), this); serverList->addColumn(i18n("Services/Catalogs"), 10000); //make it cover the window - serverList->setColumnWidthMode(0, QListView::Manual); + serverList->setColumnWidthMode(0, Q3ListView::Manual); serverList->setTreeStepSize(30); serverList->setRootIsDecorated(true); - serverList->setHScrollBarMode(QScrollView::AlwaysOff); + serverList->setHScrollBarMode(Q3ScrollView::AlwaysOff); /* Hidden Columns - We use these to store info about the services/catalogs */ serverList->addColumn("URI", 0); // Holds catalog and service URI - serverList->setColumnWidthMode(1, QListView::Manual); + serverList->setColumnWidthMode(1, Q3ListView::Manual); serverList->addColumn("ID", 0); //Holds catalog and service ID - serverList->setColumnWidthMode(2, QListView::Manual); + serverList->setColumnWidthMode(2, Q3ListView::Manual); serverList->addColumn("Subscribed", 0); //Holds subscription status for catalogs - serverList->setColumnWidthMode(3, QListView::Manual); + serverList->setColumnWidthMode(3, Q3ListView::Manual); mainLayout->addWidget(serverList); mainLayout->setSpacing(10); - buttonLayout = new QHBoxLayout(mainLayout); + buttonLayout = new Q3HBoxLayout(mainLayout); buttonLayout->addWidget(addButton, false, 0); buttonLayout->addSpacing(300); buttonLayout->addWidget(removeButton, false, 0); @@ -85,7 +89,7 @@ void ZmdEditServers::clearList() { - QListViewItem *item; + Q3ListViewItem *item; //Clear the list serverList->clear(); @@ -96,7 +100,7 @@ addButton->setDisabled(true); //Tell the user what is going on - item = new QListViewItem(serverList, i18n("Fetching service list...")); + item = new Q3ListViewItem(serverList, i18n("Fetching service list...")); } void ZmdEditServers::initList() @@ -104,24 +108,24 @@ clearList(); //Connect the signals and call the backend - connect(core, SIGNAL(serviceListing(QValueList<Service>)), - this, SLOT(gotServiceList(QValueList<Service>))); + connect(core, SIGNAL(serviceListing(Q3ValueList<Service>)), + this, SLOT(gotServiceList(Q3ValueList<Service>))); core->getServices(); } -void ZmdEditServers::gotServiceList(QValueList<Service> servers) +void ZmdEditServers::gotServiceList(Q3ValueList<Service> servers) { - QValueList<Service>::iterator iter; - QListViewItem *item; + Q3ValueList<Service>::iterator iter; + Q3ListViewItem *item; /* Disconnect this signal. If this doesn't happen we will connect it again on each iteration and end up adding many copies of each service to the list */ - disconnect(core, SIGNAL(serviceListing(QValueList<Service>)), - this, SLOT(gotServiceList(QValueList<Service>))); + disconnect(core, SIGNAL(serviceListing(Q3ValueList<Service>)), + this, SLOT(gotServiceList(Q3ValueList<Service>))); //get rid of the preparing item and anything else //that has lingered (multiple signals) @@ -132,36 +136,36 @@ for (iter = servers.begin(); iter != servers.end(); iter++) { - item = new QListViewItem(serverList, (*iter).name); + item = new Q3ListViewItem(serverList, (*iter).name); item->setText(CONFW_URI, (*iter).uri); item->setText(CONFW_ID, (*iter).id); //Inform the user that we have not got the catalogs yet item->setOpen(true); - item = new QListViewItem(item, i18n("Fetching Catalogs For Service...")); + item = new Q3ListViewItem(item, i18n("Fetching Catalogs For Service...")); } if (servers.size() > 0) { removeButton->setDisabled(false); //re-enable the remove button - connect(core, SIGNAL(catalogListing(QValueList<Catalog>)), - this, SLOT(gotCatalogList(QValueList<Catalog>))); + connect(core, SIGNAL(catalogListing(Q3ValueList<Catalog>)), + this, SLOT(gotCatalogList(Q3ValueList<Catalog>))); core->getCatalogs(); } } -void ZmdEditServers::gotCatalogList(QValueList<Catalog> catalogs) +void ZmdEditServers::gotCatalogList(Q3ValueList<Catalog> catalogs) { - QValueList<Catalog>::iterator iter; + Q3ValueList<Catalog>::iterator iter; ZmdCatalogListItem *item; - QListViewItem *parentItem; + Q3ListViewItem *parentItem; //Disconnect this signal. If this doesn't happen, //the same thing as with services happens - disconnect(core, SIGNAL(catalogListing(QValueList<Catalog>)), - this, SLOT(gotCatalogList(QValueList<Catalog>))); + disconnect(core, SIGNAL(catalogListing(Q3ValueList<Catalog>)), + this, SLOT(gotCatalogList(Q3ValueList<Catalog>))); if (serverList->firstChild()->childCount() != 1) { @@ -192,7 +196,7 @@ void ZmdEditServers::addButtonClicked() { - QValueList<QString> list; + Q3ValueList<QString> list; ZmdServerDialog diag; ZmdProgressDialog prog(true, this); Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdInstallWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdInstallWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdInstallWindow.cpp Mon Dec 3 13:47:02 2007 @@ -25,9 +25,13 @@ #include <qmessagebox.h> #include <qvariant.h> -#include <qlistview.h> +#include <q3listview.h> #include <qlabel.h> #include <qlayout.h> +//Added by qt3to4: +#include <Q3VBoxLayout> +#include <Q3ValueList> +#include <QCloseEvent> #include "HeaderWidget.h" #include "ZmdInstallWindow.h" @@ -68,7 +72,7 @@ header = new HeaderWidget(this); transactionList = new KTextEdit(this); progressBar = new KProgress(100, this); - mainLayout = new QVBoxLayout(this); + mainLayout = new Q3VBoxLayout(this); header->setDescription(i18n("Installing updates and patches: Below is a description of the transaction and its progress. ")); @@ -104,12 +108,12 @@ closeWindow(); } -void ZmdInstallWindow::gotDepInfo(QValueList<Package> installs, - QValueList<Package> updates, - QValueList<Package> removals) +void ZmdInstallWindow::gotDepInfo(Q3ValueList<Package> installs, + Q3ValueList<Package> updates, + Q3ValueList<Package> removals) { QString text; - QValueList<Package>::iterator iter; + Q3ValueList<Package>::iterator iter; ZmdDependencyDialog diag; if (installs.size() > 0) @@ -256,9 +260,9 @@ } } -void ZmdInstallWindow::setPackageList(QValueList<Package> installs, - QValueList<Package> updates, - QValueList<Package> removals) +void ZmdInstallWindow::setPackageList(Q3ValueList<Package> installs, + Q3ValueList<Package> updates, + Q3ValueList<Package> removals) { installList = installs; updateList = updates; @@ -268,12 +272,12 @@ void ZmdInstallWindow::startUpdate() { core->startTransaction(installList, updateList, removeList); - connect(core, SIGNAL(realPackages(QValueList<Package>, - QValueList<Package>, - QValueList<Package>)), - this, SLOT(gotDepInfo(QValueList<Package>, - QValueList<Package>, - QValueList<Package>))); + connect(core, SIGNAL(realPackages(Q3ValueList<Package>, + Q3ValueList<Package>, + Q3ValueList<Package>)), + this, SLOT(gotDepInfo(Q3ValueList<Package>, + Q3ValueList<Package>, + Q3ValueList<Package>))); transactionList->setText(i18n("Resolving Dependencies...")); } Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdProgressDialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdProgressDialog.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdProgressDialog.cpp Mon Dec 3 13:47:02 2007 @@ -24,6 +24,9 @@ #include <qlayout.h> #include <qlabel.h> +//Added by qt3to4: +#include <Q3VBoxLayout> +#include <QCloseEvent> ZmdProgressDialog::ZmdProgressDialog(bool progressGUI, QWidget *parent) : QDialog(parent) @@ -41,7 +44,7 @@ void ZmdProgressDialog::initProgressGUI() { - mainLayout = new QVBoxLayout(this); + mainLayout = new Q3VBoxLayout(this); progressBar = new KProgress(this); description = new QLabel(this); @@ -62,7 +65,7 @@ void ZmdProgressDialog::initTextGUI() { - mainLayout = new QVBoxLayout(this); + mainLayout = new Q3VBoxLayout(this); description = new QLabel(this); mainLayout->addWidget(description,0,0); Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdRugParser.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdRugParser.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdRugParser.cpp Mon Dec 3 13:47:02 2007 @@ -23,7 +23,7 @@ #include <qstring.h> #include <qstringlist.h> -#include <qdict.h> +#include <q3dict.h> #include <qvariant.h> ZmdRugParser::ZmdRugParser(QObject *parent) : QObject(parent) Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdServerDialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdServerDialog.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdServerDialog.cpp Mon Dec 3 13:47:02 2007 @@ -26,8 +26,12 @@ #include <qlabel.h> #include <qstring.h> #include <qlayout.h> -#include <qbuttongroup.h> +#include <q3buttongroup.h> #include <qradiobutton.h> +//Added by qt3to4: +#include <Q3HBoxLayout> +#include <Q3VBoxLayout> +#include <Q3ValueList> /** Enum to represent the various types of ZMD Repo **/ enum { TYPE_ZYPP=0, /** Zypp **/ @@ -44,9 +48,9 @@ initGUI(); } -QValueList<QString> ZmdServerDialog::getServerInfo() +Q3ValueList<QString> ZmdServerDialog::getServerInfo() { - QValueList<QString> list; + Q3ValueList<QString> list; list.append(name); list.append(server); switch (typeGroup->selectedId()) @@ -76,12 +80,12 @@ void ZmdServerDialog::initGUI() { - layout = new QVBoxLayout(this); + layout = new Q3VBoxLayout(this); nameLabel = new QLabel(i18n("Please enter server name below"), this); serverLabel = new QLabel(i18n("Please enter server URL below"), this); nameEdit = new KLineEdit(this); serverEdit = new KLineEdit(this); - typeGroup = new QButtonGroup(2, Qt::Vertical, i18n("Server Type"), this); + typeGroup = new Q3ButtonGroup(2, Qt::Vertical, i18n("Server Type"), this); QRadioButton *zButton = new QRadioButton("ZYPP", typeGroup); QRadioButton *yButton = new QRadioButton("YUM", typeGroup); QRadioButton *aButton = new QRadioButton("ZENworks", typeGroup); @@ -108,7 +112,7 @@ typeGroup->insert(rButton, TYPE_RCE); typeGroup->setButton(TYPE_ZYPP); - buttonLayout = new QHBoxLayout(layout); + buttonLayout = new Q3HBoxLayout(layout); buttonLayout->addWidget(cancelButton, 0, Qt::AlignLeft); buttonLayout->addSpacing(100); buttonLayout->addWidget(addButton, 0, Qt::AlignRight); Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdateListItem.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdateListItem.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdateListItem.cpp Mon Dec 3 13:47:02 2007 @@ -19,8 +19,8 @@ #include "ZmdUpdateListItem.h" -ZmdUpdateListItem::ZmdUpdateListItem( QListView *parent, const QString &text, QCheckListItem::Type style) - : QCheckListItem(parent, text, style ) +ZmdUpdateListItem::ZmdUpdateListItem( Q3ListView *parent, const QString &text, Q3CheckListItem::Type style) + : Q3CheckListItem(parent, text, style ) , _selectedCount(0) { setTristate(false); @@ -37,12 +37,12 @@ //Deal with tristate, even when we disable this switch (this->state()) { - case QCheckListItem::Off: - case QCheckListItem::NoChange: + case Q3CheckListItem::Off: + case Q3CheckListItem::NoChange: setOn(false); _selectedCount--; break; - case QCheckListItem::On: + case Q3CheckListItem::On: setOn(true); _selectedCount++; break; Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdater.cpp Mon Dec 3 13:47:02 2007 @@ -25,7 +25,10 @@ #include <kapp.h> #include <kgenericfactory.h> -#include <qpopupmenu.h> +#include <q3popupmenu.h> +//Added by qt3to4: +#include <Q3CString> +#include <Q3ValueList> #include <stdio.h> #include <string.h> @@ -58,11 +61,11 @@ //authorizeCore(); //Connect core signals - connect(core, SIGNAL(updateListing(QValueList<Package>)), - this, SLOT(gotUpdateListing(QValueList<Package>))); + connect(core, SIGNAL(updateListing(Q3ValueList<Package>)), + this, SLOT(gotUpdateListing(Q3ValueList<Package>))); - connect(core, SIGNAL(patchListing(QValueList<Patch>)), - this, SLOT(gotPatchListing(QValueList<Patch>))); + connect(core, SIGNAL(patchListing(Q3ValueList<Patch>)), + this, SLOT(gotPatchListing(Q3ValueList<Patch>))); connect(core, SIGNAL(packageInfo(Package)), this, SLOT(gotPackageInfo(Package))); @@ -71,22 +74,22 @@ this, SLOT(gotPatchInfo(Patch))); connect(core, SIGNAL(depInfo(QString, - QValueList<Package>, - QValueList<Package>, - QValueList<Package>, - QValueList<Package>)), + Q3ValueList<Package>, + Q3ValueList<Package>, + Q3ValueList<Package>, + Q3ValueList<Package>)), this, SLOT(gotDepInfo(QString, - QValueList<Package>, - QValueList<Package>, - QValueList<Package>, - QValueList<Package>))); + Q3ValueList<Package>, + Q3ValueList<Package>, + Q3ValueList<Package>, + Q3ValueList<Package>))); connect(core, SIGNAL(generalFault(QString, int)), this, SLOT(error(QString, int))); #ifndef NO_PACKAGE_LOCKS - connect(core, SIGNAL(lockListing(QValueList<PackageLock>)), - this, SLOT(gotLockListing(QValueList<PackageLock>))); + connect(core, SIGNAL(lockListing(Q3ValueList<PackageLock>)), + this, SLOT(gotLockListing(Q3ValueList<PackageLock>))); #endif core->ping(); } @@ -109,21 +112,21 @@ *********************************************************************/ -void ZmdUpdater::populateUpdateList(QListView *updateList) +void ZmdUpdater::populateUpdateList(Q3ListView *updateList) { tempList = updateList; emit(updateApplet(APPLET_NO_UPDATES, 0)); - connect(core, SIGNAL(serviceListing(QValueList<Service>)), - this, SLOT(gotServiceListing(QValueList<Service>))); + connect(core, SIGNAL(serviceListing(Q3ValueList<Service>)), + this, SLOT(gotServiceListing(Q3ValueList<Service>))); core->getServices(); currentPackages.clear(); currentPatches.clear(); } -void ZmdUpdater::updateSelected(QListViewItem *item) +void ZmdUpdater::updateSelected(Q3ListViewItem *item) { QString id; @@ -141,13 +144,13 @@ } } -void ZmdUpdater::updateMenu(QListViewItem *item, const QPoint& point) +void ZmdUpdater::updateMenu(Q3ListViewItem *item, const QPoint& point) { #ifndef NO_PACKAGE_LOCKS if (item != NULL && tempList != NULL) { - QPopupMenu *menu = new QPopupMenu(tempList); + Q3PopupMenu *menu = new Q3PopupMenu(tempList); if (item->text(COLUMN_LOCK) == "") { menu->insertItem(i18n("Hold Back Package"), this, SLOT(holdPackage())); @@ -203,8 +206,8 @@ if (tempList != NULL) { - QValueList<Package> upList; - QValueList<Package> instList; + Q3ValueList<Package> upList; + Q3ValueList<Package> instList; ZmdUpdateListItem *item = (ZmdUpdateListItem*)(tempList->firstChild()); if (item == NULL) @@ -214,7 +217,7 @@ do { - if (item->state() == QCheckListItem::On) + if (item->state() == Q3CheckListItem::On) { QString id; id = item->text(COLUMN_ID); //gets the id @@ -244,7 +247,7 @@ if (instList.size() > 0 || upList.size() > 0) { ZmdInstallWindow *win = new ZmdInstallWindow(core); //deletes itself - win->setPackageList(instList, upList, QValueList<Package>()); + win->setPackageList(instList, upList, Q3ValueList<Package>()); win->startUpdate(); //Allow the install window to signal an update refresh @@ -287,7 +290,7 @@ */ //ZMD Lock Support Incomplete Via XML-RPC (Hence we don't support it yet) -void ZmdUpdater::gotLockListing(QValueList<PackageLock> locks) +void ZmdUpdater::gotLockListing(Q3ValueList<PackageLock> locks) { /* QListViewItem *item; @@ -312,14 +315,14 @@ */ } -void ZmdUpdater::gotServiceListing(QValueList<Service> list) +void ZmdUpdater::gotServiceListing(Q3ValueList<Service> list) { - disconnect(core, SIGNAL(serviceListing(QValueList<Service>)), - this, SLOT(gotServiceListing(QValueList<Service>))); + disconnect(core, SIGNAL(serviceListing(Q3ValueList<Service>)), + this, SLOT(gotServiceListing(Q3ValueList<Service>))); - connect(core, SIGNAL(catalogListing(QValueList<Catalog>)), - this, SLOT(gotCatalogListing(QValueList<Catalog>))); + connect(core, SIGNAL(catalogListing(Q3ValueList<Catalog>)), + this, SLOT(gotCatalogListing(Q3ValueList<Catalog>))); //Ok, we communicated with zmd, don't show the error on failure now showGeneralFaultError = false; @@ -328,12 +331,12 @@ core->getCatalogs(); } -void ZmdUpdater::gotCatalogListing(QValueList<Catalog> catalogs) +void ZmdUpdater::gotCatalogListing(Q3ValueList<Catalog> catalogs) { - QValueList<Catalog>::iterator iter; + Q3ValueList<Catalog>::iterator iter; - disconnect(core, SIGNAL(catalogListing(QValueList<Catalog>)), - this, SLOT(gotCatalogListing(QValueList<Catalog>))); + disconnect(core, SIGNAL(catalogListing(Q3ValueList<Catalog>)), + this, SLOT(gotCatalogListing(Q3ValueList<Catalog>))); if (catalogs.size() <= 0) return; @@ -351,9 +354,9 @@ } } -void ZmdUpdater::gotUpdateListing(QValueList<Package> packageList) +void ZmdUpdater::gotUpdateListing(Q3ValueList<Package> packageList) { - QValueList<Package>::iterator iter; + Q3ValueList<Package>::iterator iter; ZmdUpdateListItem *newItem; if (packageList.size() > 0 || tempList->childCount() > 0) @@ -367,7 +370,7 @@ for (iter = packageList.begin(); iter != packageList.end(); iter++) { - newItem = new ZmdUpdateListItem(tempList, (*iter).name, QCheckListItem::CheckBox); + newItem = new ZmdUpdateListItem(tempList, (*iter).name, Q3CheckListItem::CheckBox); newItem->setText(COLUMN_TYPE, i18n("Update")); newItem->setText(COLUMN_NEW_VERSION,(*iter).version); @@ -386,9 +389,9 @@ } } -void ZmdUpdater::gotPatchListing(QValueList<Patch> patchList) +void ZmdUpdater::gotPatchListing(Q3ValueList<Patch> patchList) { - QValueList<Patch>::iterator iter; + Q3ValueList<Patch>::iterator iter; ZmdUpdateListItem *newItem; if (patchList.size() > 0 || tempList->childCount() > 0) @@ -405,7 +408,7 @@ if ((*iter).status != 3) continue; - newItem = new ZmdUpdateListItem(tempList, (*iter).description, QCheckListItem::CheckBox); + newItem = new ZmdUpdateListItem(tempList, (*iter).description, Q3CheckListItem::CheckBox); newItem->setText(COLUMN_TYPE, i18n("Patch")); newItem->setText(COLUMN_NEW_VERSION,(*iter).version); @@ -414,7 +417,7 @@ //build our dep tree core->getDepInfo(*iter); - patchDeps[(*iter).name] = QValueList<Package>(); + patchDeps[(*iter).name] = Q3ValueList<Package>(); //Load list currentPatches[(*iter).id] = (*iter); @@ -484,10 +487,10 @@ emit(returnDescription(currentDescription)); } -void ZmdUpdater::gotDepInfo(QString name, QValueList<Package> provides, - QValueList<Package> requires, - QValueList<Package> conflicts, - QValueList<Package> obsoletes) +void ZmdUpdater::gotDepInfo(QString name, Q3ValueList<Package> provides, + Q3ValueList<Package> requires, + Q3ValueList<Package> conflicts, + Q3ValueList<Package> obsoletes) { patchDeps[name] = requires; @@ -554,7 +557,7 @@ int fd; char buffer[1024]; KProcess proc; - QCString pass; + Q3CString pass; struct pollfd pfd; int count; QString data; Modified: branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdaterCore.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdaterCore.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zmd/ZmdUpdaterCore.cpp Mon Dec 3 13:47:02 2007 @@ -21,6 +21,8 @@ #include "ZmdUpdaterCore.h" #include "Constants.h" +//Added by qt3to4: +#include <Q3ValueList> /******************************************************************** @@ -73,14 +75,14 @@ { IS_ZMD_BUSY; - QValueList<QVariant> data; + Q3ValueList<QVariant> data; server->call("zmd.system.ping", data, - this, SLOT(slotPong(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(slotPong(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } -void ZmdUpdaterCore::slotPong(const QValueList<QVariant>&, const QVariant&) +void ZmdUpdaterCore::slotPong(const Q3ValueList<QVariant>&, const QVariant&) { kdDebug() << "pong?" << endl; emit pong(); @@ -91,12 +93,12 @@ { IS_ZMD_BUSY; - QValueList<QVariant> data; + Q3ValueList<QVariant> data; QMap<QString,QVariant> map = id.toMap(); data.append(QVariant(map)); server->call("zmd.system.identity_add", data, - this, SLOT(identityData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(identityData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -105,7 +107,7 @@ IS_ZMD_BUSY; server->call("zmd.system.identity_remove", user, - this, SLOT(identityData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(identityData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -113,12 +115,12 @@ { IS_ZMD_BUSY; - QValueList<QVariant> data; + Q3ValueList<QVariant> data; QMap<QString,QVariant> map = id.toMap(); data.append(QVariant(map)); server->call("zmd.system.identity_modify", data, - this, SLOT(identityData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(identityData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -126,21 +128,21 @@ { IS_ZMD_BUSY; - server->call("zmd.system.identity_list", QValueList<QVariant>(), - this, SLOT(identityData(const QValueList<QVariant>&, const QVariant&)), + server->call("zmd.system.identity_list", Q3ValueList<QVariant>(), + this, SLOT(identityData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } -void ZmdUpdaterCore::identityData(const QValueList<QVariant>& data, const QVariant& t) +void ZmdUpdaterCore::identityData(const Q3ValueList<QVariant>& data, const QVariant& t) { if (data.front().canCast(QVariant::List) == true) { //We got a list back, is identity list - QValueList<QVariant> list; + Q3ValueList<QVariant> list; list = (data.front().toList()); - QValueList<QVariant>::iterator iter; - QValueList<Identity> identityList; + Q3ValueList<QVariant>::iterator iter; + Q3ValueList<Identity> identityList; for (iter = list.begin(); iter != list.end(); iter++) { @@ -187,8 +189,8 @@ { IS_ZMD_BUSY; kdDebug() << k_funcinfo << endl; - server->call("zmd.system.service_list", QValueList<QVariant>(), - this, SLOT(serviceData(const QValueList<QVariant>&, const QVariant&)), + server->call("zmd.system.service_list", Q3ValueList<QVariant>(), + this, SLOT(serviceData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -196,13 +198,13 @@ { IS_ZMD_BUSY; - QValueList<QVariant> data; + Q3ValueList<QVariant> data; QMap<QString,QVariant> map = serv.toMap(); data.append(QVariant(map)); temp = serv.name; server->call("zmd.system.service_add", data, - this, SLOT(serviceData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(serviceData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -211,12 +213,12 @@ IS_ZMD_BUSY; server->call("zmd.system.service_remove", serv.id, - this, SLOT(serviceData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(serviceData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } //Data slot, returning information from xml-rpc -void ZmdUpdaterCore::serviceData(const QValueList<QVariant>& data, const QVariant& t) +void ZmdUpdaterCore::serviceData(const Q3ValueList<QVariant>& data, const QVariant& t) { kdDebug() << k_funcinfo << endl; if (data.front().canCast(QVariant::String) == true && data.front().toString().isEmpty() != true) @@ -229,10 +231,10 @@ else if (data.front().canCast(QVariant::List) == true) { //We got a list back, is a service list - QValueList<QVariant> list; + Q3ValueList<QVariant> list; list = (data.front().toList()); - QValueList<QVariant>::iterator iter; - QValueList<Service> serviceList; + Q3ValueList<QVariant>::iterator iter; + Q3ValueList<Service> serviceList; for (iter = list.begin(); iter != list.end(); iter++) { @@ -265,8 +267,8 @@ { IS_ZMD_BUSY; kdDebug() << k_funcinfo << endl; - server->call("zmd.system.catalog_list", QValueList<QVariant>(), - this, SLOT(catalogData(const QValueList<QVariant>&, const QVariant&)), + server->call("zmd.system.catalog_list", Q3ValueList<QVariant>(), + this, SLOT(catalogData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -274,12 +276,12 @@ { IS_ZMD_BUSY; - QValueList<QVariant> argList; + Q3ValueList<QVariant> argList; argList.append(cat.id); argList.append(true); server->call("zmd.system.catalog_subscribe", argList, - this, SLOT(catalogData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(catalogData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -287,16 +289,16 @@ { IS_ZMD_BUSY; - QValueList<QVariant> argList; + Q3ValueList<QVariant> argList; argList.append(cat.id); argList.append(false); server->call("zmd.system.catalog_subscribe", argList, - this, SLOT(catalogData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(catalogData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } -void ZmdUpdaterCore::catalogData(const QValueList<QVariant>& data, const QVariant& t) +void ZmdUpdaterCore::catalogData(const Q3ValueList<QVariant>& data, const QVariant& t) { kdDebug() << k_funcinfo << endl; if (data.front().canCast(QVariant::String) == true) @@ -312,10 +314,10 @@ else if (data.front().canCast(QVariant::List) == true) { //If we get a list, it is because we got a catalog listing - QValueList<QVariant> list; + Q3ValueList<QVariant> list; list = (data.front().toList()); - QValueList<QVariant>::iterator iter; - QValueList<Catalog> catalogList; + Q3ValueList<QVariant>::iterator iter; + Q3ValueList<Catalog> catalogList; for (iter = list.begin(); iter != list.end(); iter++) { @@ -344,7 +346,7 @@ IS_ZMD_BUSY; server->call("zmd.packsys.get_patches", cat.id, - this, SLOT(patchData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(patchData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -354,22 +356,22 @@ IS_ZMD_BUSY; server->call("zmd.packsys.get_updates", cat.id, - this, SLOT(updateData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(updateData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } -void ZmdUpdaterCore::updateData(const QValueList<QVariant>& data, const QVariant&t) +void ZmdUpdaterCore::updateData(const Q3ValueList<QVariant>& data, const QVariant&t) { - QValueList<Package> packageList; + Q3ValueList<Package> packageList; packageList = mapListToPackageList(data.front().toList()); emit(updateListing(packageList)); } -QValueList<Package> ZmdUpdaterCore::mapListToPackageList(QValueList<QVariant> data) +Q3ValueList<Package> ZmdUpdaterCore::mapListToPackageList(Q3ValueList<QVariant> data) { - QValueList<QVariant>::iterator iter; - QValueList<Package> packageList; + Q3ValueList<QVariant>::iterator iter; + Q3ValueList<Package> packageList; for (iter = data.begin(); iter != data.end(); iter++) { @@ -385,12 +387,12 @@ return packageList; } -void ZmdUpdaterCore::patchData(const QValueList<QVariant>& data, const QVariant& t) +void ZmdUpdaterCore::patchData(const Q3ValueList<QVariant>& data, const QVariant& t) { - QValueList<QVariant> list; + Q3ValueList<QVariant> list; list = (data.front().toList()); - QValueList<QVariant>::iterator iter; - QValueList<Patch> patchList; + Q3ValueList<QVariant>::iterator iter; + Q3ValueList<Patch> patchList; for (iter = list.begin(); iter != list.end(); iter++) { @@ -415,8 +417,8 @@ void ZmdUpdaterCore::getPackageInfo(QString packageName) { - QValueList<QVariant> wrapper; - QValueList<QVariant> args; + Q3ValueList<QVariant> wrapper; + Q3ValueList<QVariant> args; args.append("Name"); args.append("is"); @@ -425,15 +427,15 @@ wrapper.append(args); server->call("zmd.packsys.query", wrapper, - this, SLOT(infoPackageData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(infoPackageData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } void ZmdUpdaterCore::getPatchInfo(QString patchName) { - QValueList<QVariant> wrapper; - QValueList<QVariant> args; + Q3ValueList<QVariant> wrapper; + Q3ValueList<QVariant> args; args.append("Name"); args.append("is"); @@ -442,14 +444,14 @@ wrapper.append(args); server->call("zmd.packsys.query_patches", wrapper, - this, SLOT(infoPatchData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(infoPatchData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } void ZmdUpdaterCore::getPackageDetails(Package pack) { QMap<QString, QVariant> map; - QValueList<QVariant> args; + Q3ValueList<QVariant> args; map = pack.toMap(); args.append(map); @@ -458,7 +460,7 @@ temp = pack.id; server->call("zmd.packsys.package_details", args, - this, SLOT(infoPackageData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(infoPackageData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -466,7 +468,7 @@ void ZmdUpdaterCore::getPatchDetails(Patch patch) { QMap<QString, QVariant> map; - QValueList<QVariant> args; + Q3ValueList<QVariant> args; map = patch.toMap(); args.append(map); @@ -475,19 +477,19 @@ temp = patch.id; server->call("zmd.packsys.patch_details", args, - this, SLOT(infoPatchData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(infoPatchData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } -void ZmdUpdaterCore::infoPackageData(const QValueList<QVariant>& data, const QVariant& t) +void ZmdUpdaterCore::infoPackageData(const Q3ValueList<QVariant>& data, const QVariant& t) { //We either get a List or a Map in this return. If its a list, then we just called getInfo if (data.front().canCast(QVariant::List) == true) { - QValueList<QVariant>::const_iterator iter; + Q3ValueList<QVariant>::const_iterator iter; for (iter = (data.front().toList().begin()); iter != (data.front().toList().end()); iter++) { Package pack; @@ -508,14 +510,14 @@ } } -void ZmdUpdaterCore::infoPatchData(const QValueList<QVariant>& data, const QVariant& t) +void ZmdUpdaterCore::infoPatchData(const Q3ValueList<QVariant>& data, const QVariant& t) { //We either get a List or a Map in this return. If its a list, then we just called getInfo if (data.front().canCast(QVariant::List) == true) { - QValueList<QVariant>::const_iterator iter; + Q3ValueList<QVariant>::const_iterator iter; for (iter = (data.front().toList().begin()); iter != (data.front().toList().end()); iter++) { Patch patch; @@ -547,26 +549,26 @@ IS_ZMD_BUSY; QMap<QString, QVariant> map; - QValueList<QVariant> wrapper; + Q3ValueList<QVariant> wrapper; map = pack.toMap(); wrapper.append(QVariant(map)); temp = pack.name; server->call("zmd.packsys.resolvable_dependencies", wrapper, - this, SLOT(depData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(depData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } -void ZmdUpdaterCore::depData(const QValueList<QVariant> &data, const QVariant &t) +void ZmdUpdaterCore::depData(const Q3ValueList<QVariant> &data, const QVariant &t) { if (data.front().canCast(QVariant::Map) == true) { - QValueList<Package> providesList; - QValueList<Package> requiresList; - QValueList<Package> conflictsList; - QValueList<Package> obsoletesList; + Q3ValueList<Package> providesList; + Q3ValueList<Package> requiresList; + Q3ValueList<Package> conflictsList; + Q3ValueList<Package> obsoletesList; QMap<QString, QVariant> outerMap = data.front().toMap(); providesList = mapListToPackageList(outerMap["provides"].toList()); @@ -589,7 +591,7 @@ IS_ZMD_BUSY; QMap<QString, QVariant> map; - QValueList<QVariant> wrapper; + Q3ValueList<QVariant> wrapper; map = lock.toMap(); @@ -602,7 +604,7 @@ wrapper.append(map); server->call("zmd.packsys.add_lock", wrapper, - this, SLOT(lockData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(lockData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -610,7 +612,7 @@ { IS_ZMD_BUSY; - QValueList<QVariant> wrapper; + Q3ValueList<QVariant> wrapper; if (lock.id == "") return; @@ -618,7 +620,7 @@ wrapper.append(lock.id); server->call("zmd.packsys.remove_lock", wrapper, - this, SLOT(lockData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(lockData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } @@ -626,26 +628,26 @@ { IS_ZMD_BUSY; - server->call("zmd.packsys.get_locks", QValueList<QVariant>(), - this, SLOT(lockData(const QValueList<QVariant>&, const QVariant&)), + server->call("zmd.packsys.get_locks", Q3ValueList<QVariant>(), + this, SLOT(lockData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } -void ZmdUpdaterCore::lockData(const QValueList<QVariant>& data, const QVariant &t) +void ZmdUpdaterCore::lockData(const Q3ValueList<QVariant>& data, const QVariant &t) { if (data.front().canCast(QVariant::List) == true) { QMap<QString, QVariant> map; - QValueList<QVariant> list; - QValueList<PackageLock> lockList; + Q3ValueList<QVariant> list; + Q3ValueList<PackageLock> lockList; #ifdef DEBUG kdWarning() << "got a list of locks" << endl; #endif list = data.front().toList(); - for (QValueList<QVariant>::iterator iter = list.begin(); iter != list.end(); iter++) + for (Q3ValueList<QVariant>::iterator iter = list.begin(); iter != list.end(); iter++) { PackageLock lock ; @@ -674,9 +676,9 @@ * ********************************************************************/ -void ZmdUpdaterCore::startTransaction(QValueList<Package> installList, - QValueList<Package> updateList, - QValueList<Package> removeList) +void ZmdUpdaterCore::startTransaction(Q3ValueList<Package> installList, + Q3ValueList<Package> updateList, + Q3ValueList<Package> removeList) { IS_ZMD_BUSY; @@ -686,21 +688,21 @@ packagesToUpdate.clear(); packagesToRemove.clear(); - for (QValueList<Package>::iterator iter = installList.begin(); + for (Q3ValueList<Package>::iterator iter = installList.begin(); iter != installList.end(); iter++) { QMap<QString, QVariant> map; map = (*iter).toMap(); packagesToInstall[map["id"].toString()] = QVariant(map); } - for (QValueList<Package>::iterator iter = updateList.begin(); + for (Q3ValueList<Package>::iterator iter = updateList.begin(); iter != updateList.end(); iter++) { QMap<QString, QVariant> map; map = (*iter).toMap(); packagesToUpdate[map["id"].toString()] = QVariant(map); } - for (QValueList<Package>::iterator iter = removeList.begin(); + for (Q3ValueList<Package>::iterator iter = removeList.begin(); iter != removeList.end(); iter++) { QMap<QString, QVariant> map; @@ -711,15 +713,15 @@ #ifdef DEBUG kdWarning() << "Asking for dep verification" << endl; #endif - server->call("zmd.packsys.verify", QValueList<QVariant>(), - this, SLOT(transactData(const QValueList<QVariant>&, const QVariant&)), + server->call("zmd.packsys.verify", Q3ValueList<QVariant>(), + this, SLOT(transactData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } void ZmdUpdaterCore::runTransaction() { - QValueList<QVariant> argList; + Q3ValueList<QVariant> argList; argList.append(packagesToInstall.values()); argList.append(packagesToUpdate.values()); @@ -727,7 +729,7 @@ argList.append(0); //Run it, no dry run server->call("zmd.packsys.transact", argList, - this, SLOT(transactData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(transactData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); //Don't need these anymore @@ -736,18 +738,18 @@ packagesToUpdate.clear(); } -void ZmdUpdaterCore::transactData(const QValueList<QVariant>& data, const QVariant &t) +void ZmdUpdaterCore::transactData(const Q3ValueList<QVariant>& data, const QVariant &t) { static bool verification = true; - QValueList<QVariant> argList; + Q3ValueList<QVariant> argList; // Is the first member of the arg list a map? If so, we just got verification/dep info if ((data.front()).canCast(QVariant::Map) == true) { QMap<QString,QVariant> map; - QValueList<QVariant> list; - QValueList<QVariant>::iterator listIter; + Q3ValueList<QVariant> list; + Q3ValueList<QVariant>::iterator listIter; map = data.front().toMap(); list = map["installs"].toList(); @@ -797,7 +799,7 @@ if (verification) { //If this is true, the info we just got is verification info server->call("zmd.packsys.resolve_dependencies", argList, - this, SLOT(transactData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(transactData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); verification = false; //next time through we do the transact @@ -805,9 +807,9 @@ else { - QValueList<Package> installs; - QValueList<Package> removals; - QValueList<Package> updates; + Q3ValueList<Package> installs; + Q3ValueList<Package> removals; + Q3ValueList<Package> updates; installs = mapListToPackageList(packagesToInstall.values()); @@ -838,13 +840,13 @@ ZMD_CLEAR; #ifdef _ABORT_SUPPORTED_ - server->call("zmd.packsys.abort_transaction", QValueList<QVariant>(), - this, SLOT(abortData(const QValueList<QVariant>&, const QVariant&)), + server->call("zmd.packsys.abort_transaction", Q3ValueList<QVariant>(), + this, SLOT(abortData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); #endif } -void ZmdUpdaterCore::abortData(const QValueList<QVariant>& data, const QVariant& t) +void ZmdUpdaterCore::abortData(const Q3ValueList<QVariant>& data, const QVariant& t) {} /******************************************************************** @@ -859,19 +861,19 @@ if (downloadID != "") { server->call("zmd.system.poll", downloadID, - this, SLOT(timerData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(timerData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } else { server->call("zmd.system.poll", pollID, - this, SLOT(timerData(const QValueList<QVariant>&, const QVariant&)), + this, SLOT(timerData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); } } -void ZmdUpdaterCore::timerData(const QValueList<QVariant>& data, const QVariant &t) +void ZmdUpdaterCore::timerData(const Q3ValueList<QVariant>& data, const QVariant &t) { if (data.front().canCast(QVariant::Map) == true) Modified: branches/tmp/tgoettlicher/updater-kde/updater/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zypp/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zypp/CMakeLists.txt Mon Dec 3 13:47:02 2007 @@ -9,21 +9,16 @@ licensedialog.cpp ) -KDE3_AUTOMOC(${opensuseupdater_zypp_PART_SRCS}) -KDE3_ADD_KPART(opensuseupdater_zypp ${opensuseupdater_zypp_PART_SRCS}) +KDE4_AUTOMOC(${opensuseupdater_zypp_PART_SRCS}) +KDE4_ADD_KPART(opensuseupdater_zypp ${opensuseupdater_zypp_PART_SRCS}) TARGET_LINK_LIBRARIES(opensuseupdater_zypp ${QT_AND_KDECORE_LIBS} opensuseupdater ) -#INSTALL_TARGETS(/lib/kde3 opensuseupdater_zypp ) -#INSTALL_TARGETS(${KDE3_LIB_DIR} opensuseupdater_zypp ) -#INSTALL(TARGETS opensuseupdater_zypp DESTINATION ${KDE3_LIB_INSTALL_DIR} ) INSTALL(TARGETS opensuseupdater_zypp DESTINATION ${KDE3_LIB_INSTALL_DIR}/kde3 ) -#INSTALL(TARGETS opensuseupdater_zypp DESTINATION ${KDE3_LIB_DIR} ) ########### install files ############### INSTALL_FILES( /share/services FILES opensuseupdater_zypp.desktop ) - INSTALL( PROGRAMS zypper_install DESTINATION /usr/sbin Modified: branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppListItem.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppListItem.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppListItem.cpp Mon Dec 3 13:47:02 2007 @@ -19,10 +19,10 @@ #include "ZYppListItem.h" -ZYppListItem::ZYppListItem( ZYppResolvable *resolvable, QListView *parent, const QString &text ) +ZYppListItem::ZYppListItem( ZYppResolvable *resolvable, Q3ListView *parent, const QString &text ) // : QListViewItem(parent, text ) : - QCheckListItem(parent, text , QCheckListItem::CheckBox ) + Q3CheckListItem(parent, text , Q3CheckListItem::CheckBox ) , _resolvable(resolvable) {} Modified: branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppUpdater.cpp Mon Dec 3 13:47:02 2007 @@ -24,12 +24,12 @@ #include <sys/types.h> #include <fcntl.h> -#include <qptrlist.h> -#include <qlistview.h> +#include <q3ptrlist.h> +#include <q3listview.h> #include <qobject.h> -#include <qpopupmenu.h> +#include <q3popupmenu.h> #include <qtimer.h> -#include <qprogressdialog.h> +#include <q3progressdialog.h> #include <qmessagebox.h> #include <kglobal.h> @@ -230,9 +230,9 @@ kdDebug() << "populating... " << _resolvables.count() << " resolvables" << endl; - for ( QPtrList<ZYppResolvable>::const_iterator it = _resolvables.begin(); it != _resolvables.end(); ++it ) + for ( Q3PtrList<ZYppResolvable>::const_iterator it = _resolvables.begin(); it != _resolvables.end(); ++it ) { - QCheckListItem *newItem; + Q3CheckListItem *newItem; if ( (*it)->resolvableType == RESOLVABLE_PATCH) newItem = new ZYppListItem ( (*it), _patchList, (*it)->name ); @@ -345,7 +345,7 @@ emit(showProgress(true)); } -void ZYppUpdater::populateLists(QListView *patchList, QListView *packageList, bool silent ) +void ZYppUpdater::populateLists(Q3ListView *patchList, Q3ListView *packageList, bool silent ) { kdDebug() << "got populate UI request..." << endl; _patchList = patchList; @@ -355,7 +355,7 @@ doCheckForUpdates(); } -void ZYppUpdater::resolvableSelected(QListViewItem *item, int resolvableType) +void ZYppUpdater::resolvableSelected(Q3ListViewItem *item, int resolvableType) { // retrieve description kdDebug() << "updating item" << endl; @@ -393,7 +393,7 @@ QStringList installPatchList; QStringList installPackageList; - QCheckListItem *item = (QCheckListItem*)_patchList->firstChild(); + Q3CheckListItem *item = (Q3CheckListItem*)_patchList->firstChild(); kdDebug() << "patchlist elements: " << _patchList->childCount() << endl; @@ -417,10 +417,10 @@ } } } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } - item = (QCheckListItem*)_packageList->firstChild(); + item = (Q3CheckListItem*)_packageList->firstChild(); while (item != NULL) { @@ -440,7 +440,7 @@ } } } - item = (QCheckListItem*)item->nextSibling(); + item = (Q3CheckListItem*)item->nextSibling(); } if ( installPatchList.isEmpty() && installPackageList.isEmpty() ) Modified: branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppUpdaterPreferencesModule.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppUpdaterPreferencesModule.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zypp/ZYppUpdaterPreferencesModule.cpp Mon Dec 3 13:47:02 2007 @@ -1,4 +1,6 @@ #include <qlayout.h> +//Added by qt3to4: +#include <Q3VBoxLayout> #include <kparts/componentfactory.h> #include <klocale.h> @@ -13,7 +15,7 @@ ZYppUpdaterPreferencesModule::ZYppUpdaterPreferencesModule(QWidget *parent, const QStringList &args) : KCModule(ZYppUpdaterPreferencesModuleFactory::componentData(), parent, args) { - QVBoxLayout* l = new QVBoxLayout( this ); + Q3VBoxLayout* l = new Q3VBoxLayout( this ); QWidget* w = new QWidget; m_preferencesWidget = new ZYppUpdaterPreferences_Base; m_preferencesWidget->setupUi( w ); Modified: branches/tmp/tgoettlicher/updater-kde/updater/zypp/licensedialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zypp/licensedialog.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zypp/licensedialog.cpp Mon Dec 3 13:47:02 2007 @@ -2,6 +2,8 @@ #include <kdebug.h> #include <qstring.h> +//Added by qt3to4: +#include <Q3GridLayout> #include <ktextedit.h> #include <qlabel.h> #include <qlayout.h> @@ -13,7 +15,7 @@ { setModal(true); - QGridLayout *layout = new QGridLayout(this); + Q3GridLayout *layout = new Q3GridLayout(this); headline = new QLabel(this); Modified: branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppListItem.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppListItem.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppListItem.cpp Mon Dec 3 13:47:02 2007 @@ -19,8 +19,8 @@ #include "ZYppListItem.h" -ZYppListItem::ZYppListItem( ZYppResolvable *patch, QListView *parent, const QString &text ) - : QListViewItem(parent, text ) +ZYppListItem::ZYppListItem( ZYppResolvable *patch, Q3ListView *parent, const QString &text ) + : Q3ListViewItem(parent, text ) , _patch(patch) { } Modified: branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp Mon Dec 3 13:47:02 2007 @@ -24,10 +24,10 @@ #include <sys/types.h> #include <fcntl.h> -#include <qptrlist.h> -#include <qlistview.h> +#include <q3ptrlist.h> +#include <q3listview.h> #include <qobject.h> -#include <qpopupmenu.h> +#include <q3popupmenu.h> #include <qtimer.h> #include <kglobal.h> @@ -155,11 +155,11 @@ // TODO kdDebug() << "populating... " << _patches.count() << " patches" << endl; - for ( QPtrList<ZYppResolvable>::const_iterator it = _patches.begin(); it != _patches.end(); ++it ) + for ( Q3PtrList<ZYppResolvable>::const_iterator it = _patches.begin(); it != _patches.end(); ++it ) { if ( (*it)->category != "optional" ) { - QListViewItem *newItem; + Q3ListViewItem *newItem; newItem = new ZYppListItem( (*it), _patchList, (*it)->summary ); // newItem->setText(COLUMN_TYPE, ((*it)->category == "security") ? i18n("Security") : i18n("Patch") ); @@ -244,7 +244,7 @@ //mStatusLabel->setText( i18n("Checking...") ); } -void ZYppUpdater::populateLists(QListView *patchList, QListView *packageList ) +void ZYppUpdater::populateLists(Q3ListView *patchList, Q3ListView *packageList ) { kdDebug() << "got populate UI request..." << endl; _patchList = patchList; @@ -255,7 +255,7 @@ -void ZYppUpdater::resolvableSelected(QListViewItem *item, int resolvableType) +void ZYppUpdater::resolvableSelected(Q3ListViewItem *item, int resolvableType) { // retrieve description kdDebug() << "updating item" << endl; Modified: branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppUpdaterPreferencesModule.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde/… ============================================================================== --- branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppUpdaterPreferencesModule.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde/updater/zypp_traditional/ZYppUpdaterPreferencesModule.cpp Mon Dec 3 13:47:02 2007 @@ -1,4 +1,6 @@ #include <qlayout.h> +//Added by qt3to4: +#include <Q3VBoxLayout> #include <kparts/componentfactory.h> #include <klocale.h> @@ -13,7 +15,7 @@ ZYppUpdaterPreferencesModule::ZYppUpdaterPreferencesModule(QWidget *parent, const QStringList &args) : KCModule(ZYppUpdaterPreferencesModuleFactory::componentData(), parent, args) { - QVBoxLayout* l = new QVBoxLayout( this ); + Q3VBoxLayout* l = new Q3VBoxLayout( this ); QWidget* w = new QWidget; m_preferencesWidget = new ZYppUpdaterPreferences_Base; m_preferencesWidget->setupUi( w ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8004 - /trunk/zypper/src/zypper.cc
by jkupec＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: jkupec Date: Mon Dec 3 13:18:53 2007 New Revision: 8004 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8004&view=rev Log: - _running_help was unitialized (thanx schubi) Modified: trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8004&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Mon Dec 3 13:18:53 2007 @@ -54,7 +54,8 @@ Zypper::Zypper() : _argc(0), _argv(NULL), _command(ZypperCommand::NONE), - _exiting(false), _exit_code(ZYPPER_EXIT_OK), _running_shell(false), + _exiting(false), _exit_code(ZYPPER_EXIT_OK), + _running_shell(false), _running_help(false), _sh_argc(0), _sh_argv(NULL) { MIL << "Hi, me zypper " VERSION " built " << __DATE__ << " " << __TIME__ << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8003 - /trunk/libzypp-testsuite/solver/data.deptestomatic/kernel-tests/2_2_2-smp-test.solution6
by coolo＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: coolo Date: Mon Dec 3 10:31:22 2007 New Revision: 8003 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8003&view=rev Log: ugly test Added: trunk/libzypp-testsuite/solver/data.deptestomatic/kernel-tests/2_2_2-smp-test.solution6 - copied, changed from r8002, trunk/libzypp-testsuite/solver/data.deptestomatic/kernel-tests/2_2_2-smp-test.solution5 Copied: trunk/libzypp-testsuite/solver/data.deptestomatic/kernel-tests/2_2_2-smp-test.solution6 (from r8002, trunk/libzypp-testsuite/solver/data.deptestomatic/kernel-tests/2_2_2-smp-test.solution5) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/kernel-tests/2_2_2-smp-test.solution5 (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/kernel-tests/2_2_2-smp-test.solution6 Mon Dec 3 10:31:22 2007 @@ -724,7 +724,7 @@ >!> 1 problems found: >!> Problem: >!> cloop-kmp-smp cannot be installed due to missing dependencies ->!> There are no installable providers of kernel(smp:mm) == 58746e28e1dfb1e0 for cloop-kmp-smp-2.01_2.6.16_rc5_git14_3c-15.i586[packages] +>!> There are no installable providers of kernel(smp:vmlinux) == 286b3d74d4368df0 for cloop-kmp-smp-2.01_2.6.16_rc5_git14_3c-15.i586[packages] >!> Solution: >!> do not install cloop-kmp-smp >!> do not install cloop-kmp-smp-2.01_2.6.16_rc5_git14_3c-15.i586[packages] -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8002 - /trunk/zypper/src/zypper-repos.cc
by jkupec＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: jkupec Date: Sun Dec 2 16:47:36 2007 New Revision: 8002 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8002&view=rev Log: - load resolvables only once in shell - TODO: handle repository manipulation within the shell (the pool and the internal data must be updated) Modified: trunk/zypper/src/zypper-repos.cc Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=8… ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Sun Dec 2 16:47:36 2007 @@ -352,9 +352,7 @@ return; if ( !zypper.globalOpts().disable_system_sources ) - { do_init_repos(zypper); - } done = true; } @@ -1102,9 +1100,17 @@ void cond_load_resolvables(Zypper & zypper, bool to_pool) { + static bool done = false; + // don't call this fuction more than once for a single ZYpp instance + // (e.g. in shell) + if (done) + return; + load_repo_resolvables(zypper, to_pool); if (!zypper.globalOpts().disable_system_resolvables && to_pool) load_target_resolvables(zypper); + + done = true; } // --------------------------------------------------------------------------- -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0