[zypp-commit] r8054 - in /branches/tmp/tgoettlicher/updater-kde_qt4porting: ./ kxmlrpcclient/ udshttp/ udshttp/test/ updater/ updater/zypp/

Author: tgoettlicher Date: Thu Dec 6 20:23:23 2007 New Revision: 8054 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8054&view=rev Log: backup Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.h branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.h branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/test/udstest.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/CMakeLists.txt branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppListItem.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdaterPreferencesModule.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/zyppupdaterpreferences_base.ui Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/CMakeLists.txt Thu Dec 6 20:23:23 2007 @@ -28,8 +28,9 @@ INCLUDE(CPack) -SET(QT_QT_INCLUDE_DIR /usr/include/Qt ) +#SET(QT_QT_INCLUDE_DIR /usr/include/Qt /usr/include/Qt/QtGui ) FIND_PACKAGE(KDE4 REQUIRED) +FIND_PACKAGE(Qt4 REQUIRED) add_definitions(${QT_DEFINITIONS} -DQT3_SUPPORT) FIND_PACKAGE(Gettext REQUIRED) @@ -66,7 +67,7 @@ ADD_SUBDIRECTORY( po ) ADD_SUBDIRECTORY( updater ) -INCLUDE_DIRECTORIES( ${KDE4_INCLUDES} ) +INCLUDE_DIRECTORIES( ${KDE4_INCLUDES} ${QT_QT_INCLUDE_DIR}/QtGui ) #MESSAGE(STATUS "Writing spec file...") #CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY) Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.cpp?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.cpp Thu Dec 6 20:23:23 2007 @@ -22,6 +22,8 @@ #include #include +//Added by qt3to4: +#include <Q3ValueList> #include "kxmlrpcquery.h" @@ -52,7 +54,7 @@ } void KXmlRpcQuery::call( const QString &server, const QString &method, - const QValueList<QVariant> &args, const QString &userAgent ) + const Q3ValueList<QVariant> &args, const QString &userAgent ) { struct sockaddr_un serveraddr; @@ -146,7 +148,7 @@ bool KXmlRpcQuery::isMessageResponse( const QDomDocument &doc ) const { - return doc.documentElement().firstChild().toElement().tagName().lower() == "params"; + return doc.documentElement().firstChild().toElement().tagName().toLower() == "params"; } KXmlRpcResult KXmlRpcQuery::parseMessageResponse( const QDomDocument &doc ) const { @@ -165,7 +167,7 @@ bool KXmlRpcQuery::isFaultResponse( const QDomDocument &doc ) const { - return doc.documentElement().firstChild().toElement().tagName().lower() == "fault"; + return doc.documentElement().firstChild().toElement().tagName().toLower() == "fault"; } KXmlRpcResult KXmlRpcQuery::parseFaultResponse( const QDomDocument &doc ) const { @@ -181,7 +183,7 @@ return response; } -QString KXmlRpcQuery::markupCall( const QString &cmd, const QValueList<QVariant> &args ) const { +QString KXmlRpcQuery::markupCall( const QString &cmd, const Q3ValueList<QVariant> &args ) const { QString markup = "<?xml version=\"1.0\" ?>\r\n<methodCall>\r\n"; @@ -190,8 +192,8 @@ if ( !args.isEmpty() ) { markup += "<params>\r\n"; - QValueList<QVariant>::ConstIterator it = args.begin(); - QValueList<QVariant>::ConstIterator end = args.end(); + Q3ValueList<QVariant>::ConstIterator it = args.begin(); + Q3ValueList<QVariant>::ConstIterator end = args.end(); for ( ; it != end; ++it ) markup += "<param>\r\n" + marshal( *it ) + "</param>\r\n"; markup += "</params>\r\n"; @@ -227,9 +229,9 @@ case QVariant::List: { QString markup = "<value><array><data>\r\n"; - const QValueList<QVariant> args = arg.toList(); - QValueList<QVariant>::ConstIterator it = args.begin(); - QValueList<QVariant>::ConstIterator end = args.end(); + const Q3ValueList<QVariant> args = arg.toList(); + Q3ValueList<QVariant>::ConstIterator it = args.begin(); + Q3ValueList<QVariant>::ConstIterator end = args.end(); for ( ; it != end; ++it ) markup += marshal( *it ); markup += "</data></array></value>\r\n"; @@ -258,10 +260,10 @@ QVariant KXmlRpcQuery::demarshal( const QDomElement &elem ) const { - Q_ASSERT( elem.tagName().lower() == "value" ); + Q_ASSERT( elem.tagName().toLower() == "value" ); const QDomElement typeElement = elem.firstChild().toElement(); - const QString typeName = typeElement.tagName().lower(); + const QString typeName = typeElement.tagName().toLower(); if ( typeName == "string" ) return QVariant( typeElement.text() ); @@ -271,17 +273,17 @@ return QVariant( typeElement.text().toDouble() ); else if ( typeName == "boolean" ) { - if ( typeElement.text().lower() == "true" || typeElement.text() == "1" ) + if ( typeElement.text().toLower() == "true" || typeElement.text() == "1" ) return QVariant( true ); else return QVariant( false ); } else if ( typeName == "base64" ) - return QVariant( KCodecs::base64Decode( typeElement.text().latin1() ) ); + return QVariant( KCodecs::base64Decode( typeElement.text().toLatin1() ) ); else if ( typeName == "datetime" || typeName == "datetime.iso8601" ) return QVariant( QDateTime::fromString( typeElement.text(), Qt::ISODate ) ); else if ( typeName == "array" ) { - QValueList<QVariant> values; + Q3ValueList<QVariant> values; QDomNode valueNode = typeElement.firstChild().firstChild(); while ( !valueNode.isNull() ) { values << demarshal( valueNode.toElement() ); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.h Thu Dec 6 20:23:23 2007 @@ -16,7 +16,7 @@ #include #include -#include +#include #include //pre-decls @@ -61,7 +61,7 @@ return m_errorString; } - QValueList<QVariant> data() const { + Q3ValueList<QVariant> data() const { return m_data; } @@ -70,7 +70,7 @@ bool m_success; int m_errorCode; QString m_errorString; - QValueList<QVariant> m_data; + Q3ValueList<QVariant> m_data; }; /** @@ -91,12 +91,12 @@ public slots: void call( const QString &server, const QString &method, - const QValueList<QVariant> &args = QValueList<QVariant>(), + const Q3ValueList<QVariant> &args = Q3ValueList<QVariant>(), const QString &userAgent = "KDE-XMLRPC" ); signals: - void message( const QValueList<QVariant> &result, const QVariant &id ); + void message( const Q3ValueList<QVariant> &result, const QVariant &id ); void fault( int, const QString&, const QVariant &id ); void finished( KXmlRpcQuery* ); @@ -109,7 +109,7 @@ KXmlRpcResult parseFaultResponse( const QDomDocument &doc ) const; QString markupCall( const QString &method, - const QValueList<QVariant> &args ) const; + const Q3ValueList<QVariant> &args ) const; QString marshal( const QVariant &v ) const; QVariant demarshal( const QDomElement &e ) const; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.cpp?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.cpp Thu Dec 6 20:23:23 2007 @@ -10,6 +10,9 @@ ***************************************************************************/ #include +//Added by qt3to4: +#include <Q3CString> +#include <Q3ValueList> #include #include @@ -40,7 +43,7 @@ KXmlRpcServer::~KXmlRpcServer() { - QValueList::Iterator it; + Q3ValueList::Iterator it; for ( it = mPendingQueries.begin(); it !=mPendingQueries.end(); ++it ) (*it)->deleteLater(); @@ -58,7 +61,7 @@ m_url = url.isValid() ? url : KUrl(); } -void KXmlRpcServer::call( const QString &method, const QValueList<QVariant> &args, +void KXmlRpcServer::call( const QString &method, const Q3ValueList<QVariant> &args, QObject* msgObj, const char* messageSlot, QObject* faultObj, const char* faultSlot, const QVariant &id ) { @@ -66,7 +69,7 @@ kWarning() << "Cannot execute call to " << method << ": empty server URL" << endl; KXmlRpcQuery *query = KXmlRpcQuery::create( id, this ); - connect( query, SIGNAL( message( const QValueList<QVariant> &, const QVariant& ) ), msgObj, messageSlot ); + connect( query, SIGNAL( message( const Q3ValueList<QVariant> &, const QVariant& ) ), msgObj, messageSlot ); connect( query, SIGNAL( fault( int, const QString&, const QVariant& ) ), faultObj, faultSlot ); connect( query, SIGNAL( finished( KXmlRpcQuery* ) ), this, SLOT( queryFinished( KXmlRpcQuery* ) ) ); mPendingQueries.append( query ); @@ -79,7 +82,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; args << arg ; call( method, args, msgObj, messageSlot, faultObj, faultSlot, id ); } @@ -89,7 +92,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; args << QVariant( arg ); call( method, args, msgObj, messageSlot, faultObj, faultSlot, id ); } @@ -99,7 +102,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; args << QVariant( arg ); call( method, args, msgObj, messageSlot, faultObj, faultSlot, id ); } @@ -109,7 +112,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; args << QVariant( arg ); call( method, args, msgObj, messageSlot, faultObj, faultSlot, id ); } @@ -119,17 +122,17 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; args << QVariant( arg ); call( method, args, msgObj, messageSlot, faultObj, faultSlot, id ); } -void KXmlRpcServer::call( const QString &method, const QCString &arg, +void KXmlRpcServer::call( const QString &method, const Q3CString &arg, QObject* msgObj, const char* messageSlot, QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; args << QVariant( arg ); call( method, args, msgObj, messageSlot, faultObj, faultSlot, id ); } @@ -139,7 +142,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; args << QVariant( arg ); call( method, args, faultObj, faultSlot, msgObj, messageSlot, id ); } @@ -149,7 +152,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; args << QVariant( arg ); call( method, args, msgObj, messageSlot, faultObj, faultSlot, id ); } @@ -159,7 +162,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; QStringList::ConstIterator it = arg.begin(); QStringList::ConstIterator end = arg.end(); for ( ; it != end; ++it ) Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.h Thu Dec 6 20:23:23 2007 @@ -15,8 +15,10 @@ #include #include -#include +#include #include +//Added by qt3to4: +#include <Q3CString> /** @file @@ -166,7 +168,7 @@ **/ template <typename T> - void call( const QString &method, const QValueList<T> &arg, + void call( const QString &method, const Q3ValueList<T> &arg, QObject* obj, const char* messageSlot, QObject* obj, const char* faultSlot, const QVariant &id = QVariant() ); @@ -174,7 +176,7 @@ public slots: - void call( const QString &method, const QValueList<QVariant> &args, + void call( const QString &method, const Q3ValueList<QVariant> &args, QObject* msgObj, const char* messageSlot, QObject* faultObj, const char* faultSlot, const QVariant &id = QVariant() ); @@ -204,7 +206,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id = QVariant() ); - void call( const QString &method, const QCString &arg , + void call( const QString &method, const Q3CString &arg , QObject* msgObj, const char* messageSlot, QObject* faultObj, const char* faultSlot, const QVariant &id = QVariant() ); @@ -233,19 +235,19 @@ KUrl m_url; QString m_userAgent; - QValueList mPendingQueries; + Q3ValueList mPendingQueries; }; template <typename T> -void KXmlRpcServer::call( const QString &method, const QValueList<T> &arg, +void KXmlRpcServer::call( const QString &method, const Q3ValueList<T> &arg, QObject* msgObj, const char* messageSlot, QObject* faultObj, const char* faultSlot, const QVariant &id ) { - QValueList<QVariant> args; + Q3ValueList<QVariant> args; - typename QValueList<T>::ConstIterator it = arg.begin(); - typename QValueList<T>::ConstIterator end = arg.end(); + typename Q3ValueList<T>::ConstIterator it = arg.begin(); + typename Q3ValueList<T>::ConstIterator end = arg.end(); for ( ; it != end; ++it ) args << QVariant( *it ); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/test/udstest.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/test/udstest.cpp?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/test/udstest.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/test/udstest.cpp Thu Dec 6 20:23:23 2007 @@ -2,6 +2,8 @@ #include #include <iostream> +//Added by qt3to4: +#include <Q3CString> using namespace std; #define KIO_ARGS QByteArray packedArgs; QDataStream stream( packedArgs, QIODevice::WriteOnly ); stream @@ -10,7 +12,7 @@ KUrl url = "udshttp:/var/tmp/kzmd-http"; KIO_ARGS << (int)1 << url; - KIO::TransferJob *job = new KIO::TransferJob(url, KIO::CMD_SPECIAL, packedArgs,QCString("Test"), false); + KIO::TransferJob *job = new KIO::TransferJob(url, KIO::CMD_SPECIAL, packedArgs,Q3CString("Test"), false); if (!job) { cout << "We could not create the specified job, something is rather wrong" << endl; } Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.cpp?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.cpp Thu Dec 6 20:23:23 2007 @@ -1,9 +1,9 @@ -#include -#include +#include +#include #include #include -#include +#include #include #include @@ -61,7 +61,7 @@ } } -kio_udshttpProtocol::kio_udshttpProtocol(const QCString &pool_socket, const QCString &app_socket) +kio_udshttpProtocol::kio_udshttpProtocol(const Q3CString &pool_socket, const Q3CString &app_socket) : SlaveBase("kio_udshttp", pool_socket, app_socket) { m_socket = NULL; @@ -171,7 +171,7 @@ void kio_udshttpProtocol::mimetype(const KUrl& url) { head(url); - data(QCString(m_contentType.local8Bit())); + data(Q3CString(m_contentType.local8Bit())); data(QByteArray()); finished(); } @@ -262,7 +262,7 @@ } parseResponse(); httpCloseConnection(); - data(QCString(m_outputData.local8Bit())); + data(Q3CString(m_outputData.local8Bit())); data(QByteArray()); finished(); return; @@ -365,7 +365,7 @@ } void kio_udshttpProtocol::parseResponse() { - QTextStream stream(m_outputData, QIODevice::ReadOnly); + Q3TextStream stream(m_outputData, QIODevice::ReadOnly); QStringList tokens; QString line; unsigned int size; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.h Thu Dec 6 20:23:23 2007 @@ -3,11 +3,11 @@ #define _udshttp_H_ #include -#include -#include +#include +#include #include #include -#include +#include #include #include @@ -24,7 +24,7 @@ */ -class QCString; +class Q3CString; class KSocket; /** @@ -61,7 +61,7 @@ class kio_udshttpProtocol : public KIO::SlaveBase { public: - kio_udshttpProtocol(const QCString &pool_socket, const QCString &app_socket); + kio_udshttpProtocol(const Q3CString &pool_socket, const Q3CString &app_socket); virtual ~kio_udshttpProtocol(); /** Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/CMakeLists.txt Thu Dec 6 20:23:23 2007 @@ -1,25 +1,35 @@ ADD_SUBDIRECTORY( zypp ) -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/kxmlrpcclient - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${KDE3_INCLUDE_DIR} - ${QT_INCLUDES} - ${KDEPIM3_CONNECTION_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/kxmlrpcclient + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${KDE4_INCLUDE_DIR} + ${QT_QT_INCLUDE_DIR} + ${QT_QTGUI_INCLUDE_DIR} + ${KDEPIM4_CONNECTION_INCLUDE_DIR} ) + +MESSAGE( STATUS ${QT_QT3SUPPORT_INCLUDE_DIR} ) ########### next target ############### KDE4_ADD_KCFG_FILES(settings_SRCS opensuseupdater_settings.kcfgc) SET(opensuseupdater_LIB_SRCS -Updater.cpp Updater.h simpleview.cpp TrayIcon.cpp UpdateListItem.cpp HeaderWidget.cpp ConfigWidget.cpp ConfigWidget.h ConfigWidgetUI.h ConfigWidgetUI.ui ${settings_SRCS} -) + Updater.cpp + Updater.h + simpleview.cpp + TrayIcon.cpp + UpdateListItem.cpp + HeaderWidget.cpp + ConfigWidget.cpp + ConfigWidget.h + ConfigWidgetUI.h + ConfigWidgetUI.ui + ${settings_SRCS}) + KDE4_ADD_UI_FILES( opensuseupdater_LIB_SRCS ConfigWidgetUI.ui ) QT4_AUTOMOC(${opensuseupdater_LIB_SRCS}) ADD_LIBRARY(opensuseupdater SHARED ${opensuseupdater_LIB_SRCS}) -#SET_TARGET_PROPERTIES(opensuseupdater PROPERTIES -# VERSION 4.2.0 -# SOVERSION 4 -# "-avoid-version -module" ) TARGET_LINK_LIBRARIES(opensuseupdater ${QT_AND_KDECORE_LIBS} kdeui ${KDEPIM3_CONNECTION_LIBRARY} ) INSTALL(TARGETS opensuseupdater DESTINATION ${KDE4_LIB_INSTALL_DIR} ) @@ -37,11 +47,11 @@ QT4_AUTOMOC(${opensuseupdater_SRCS}) KDE4_ADD_EXECUTABLE(opensuseupdater-kde ${opensuseupdater_SRCS}) -TARGET_LINK_LIBRARIES(opensuseupdater-kde - opensuseupdater - ${QT_AND_KDECORE_LIBS} +TARGET_LINK_LIBRARIES(opensuseupdater-kde + opensuseupdater + ${QT_AND_KDECORE_LIBS} kdeui - kio + kio connectionmanager ) INSTALL_TARGETS(/bin opensuseupdater-kde ) @@ -53,4 +63,3 @@ INSTALL_FILES( /share/applnk/Utilities FILES opensuseupdater.desktop ) INSTALL_FILES( /share/autostart FILES opensusestart.desktop ) -#KDE3_INSTALL_ICONS( hicolor ) Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Constants.h Thu Dec 6 20:23:23 2007 @@ -27,7 +27,7 @@ #define TRAY_ICON_GREEN "opensuseupdater_green" #define TRAY_ICON_RED "opensuseupdater_red" #define TRAY_ICON_YELLOW "opensuseupdater_yellow" -#define TRAY_ICON_PROBLEM "messagebox_warning" +#define TRAY_ICON_PROBLEM "dialog-warning" #define TRAY_ICON_CHECKING "opensuseupdater_busy" #define TRAY_ICON_INSTALLING "opensuseupdater_busy" #define TRAY_ICON_UNKNOWN "opensuseupdater_unknown" Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp Thu Dec 6 20:23:23 2007 @@ -34,7 +34,7 @@ // layout = new QHBoxLayout(this); layout = new Q3GridLayout(this); suseLogo = new QLabel(this); - text = new QLabel(this, "headline", Qt::TextSingleLine); + text = new QLabel(this, "headline", Qt::SingleLine); pic = new QPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeHuge)); text->setText(i18n("<h2>Available Updates</h2>")); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp Thu Dec 6 20:23:23 2007 @@ -495,7 +495,7 @@ int interval; interval = UpdaterSettings::self()->interval() * 60 * 60 * 1000; // convert to ms timerInterval = interval; - timer->changeInterval(timerInterval); + timer->start(timerInterval); updateTabs(); @@ -634,8 +634,8 @@ Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { - if (item->text(COLUMN_TYPE).lower() == "security" || - item->text(COLUMN_TYPE).lower() == "packagemanager" ) + if (item->text(COLUMN_TYPE).toLower() == "security" || + item->text(COLUMN_TYPE).toLower() == "packagemanager" ) { item->setState(Q3CheckListItem::On); item->setSelected(true); @@ -662,8 +662,8 @@ Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { - if (item->text(COLUMN_TYPE).lower() == "recommended" || - item->text(COLUMN_TYPE).lower() == "packagemanager" ) + if (item->text(COLUMN_TYPE).toLower() == "recommended" || + item->text(COLUMN_TYPE).toLower() == "packagemanager" ) { item->setState(Q3CheckListItem::On); item->setSelected(true); @@ -684,8 +684,8 @@ Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { - if ((item->text(COLUMN_TYPE).lower() == "recommended" || - item->text(COLUMN_TYPE).lower() == "packagemanager" ) && + if ((item->text(COLUMN_TYPE).toLower() == "recommended" || + item->text(COLUMN_TYPE).toLower() == "packagemanager" ) && (!onlySelected || item->isOn())) count++; @@ -701,7 +701,7 @@ Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { - if (item->text(COLUMN_TYPE).lower() == "security" && + if (item->text(COLUMN_TYPE).toLower() == "security" && (!onlySelected || item->isOn() ) ) count++; @@ -717,7 +717,7 @@ Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { - if (item->text(COLUMN_RESTART_HIDDEN).lower() == "restart" && + if (item->text(COLUMN_RESTART_HIDDEN).toLower() == "restart" && (!onlySelected || item->isOn())) count++; @@ -734,8 +734,8 @@ Q3CheckListItem *item = (Q3CheckListItem*)patchList->firstChild(); while (item != NULL) { - if (item->text(COLUMN_RESTART_HIDDEN).lower() == "restart" && - item->text(COLUMN_TYPE).lower() != "packagemanager" ) + if (item->text(COLUMN_RESTART_HIDDEN).toLower() == "restart" && + item->text(COLUMN_TYPE).toLower() != "packagemanager" ) { item->setState(Q3CheckListItem::Off); item->setSelected(false); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.h Thu Dec 6 20:23:23 2007 @@ -22,16 +22,14 @@ #include //Added by qt3to4: -#include <Q3HBoxLayout> +#include #include <QLabel> -#include <Q3VBoxLayout> +#include #include #include "UpdaterCapabilities.h" #include "progresspopup.h" #include #include "simpleview.h" -#include <QTabWidget> - class TrayIcon; @@ -46,6 +44,7 @@ class HeaderWidget; class OSUpdaterPopup; class KAction; +class QTabWidget; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp Thu Dec 6 20:23:23 2007 @@ -22,10 +22,12 @@ #include #include #include -#include <Q3HBoxLayout> +//Added by qt3to4: +#include #include <QLabel> #include #include + #include #include "TrayIcon.h" @@ -33,60 +35,58 @@ #include "opensuseupdater_settings.h" -TrayIcon::TrayIcon(QWidget *parent) - : KSystemTrayIcon(parent), - patchCount(0), - packageCount(0), - appletState(APPLET_NO_UPDATES) +TrayIcon::TrayIcon(QWidget *parent) : KSystemTray(parent), + patchCount(0), + packageCount(0), + appletState(APPLET_NO_UPDATES) { KIconLoader iconLoader(PROGRAM_NAME); -// setPixmap(loadIcon(TRAY_ICON_GREEN)); - loadIcon(TRAY_ICON_GREEN); - //setScaledContents(true); + setPixmap(loadIcon(TRAY_ICON_GREEN)); + setScaledContents(true); setState(APPLET_NO_UPDATES); // construct notification popup -// popup = new KPassivePopup(this); - popup = new KPassivePopup(); + popup = new KPassivePopup(this); QWidget *popupWidget = new QWidget(popup); 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")); - iconLabel->setPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeMedium)); - vb->addWidget(iconLabel); - vb->addWidget(description); + QLabel *iconLabel = new QLabel(popupWidget); + QLabel *description = new QLabel(popupWidget); + description->setText(i18n("New software for your system is available")); + iconLabel->setPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeMedium)); + vb->addWidget(iconLabel); + vb->addWidget(description); popup->setView(popupWidget); - connect(popup, SIGNAL(clicked()), this, SLOT(popupClicked())); + connect(popup, SIGNAL(clicked()), this, SLOT(popupClicked())); - int warnInterval = UpdaterSettings::self()->warnInterval() * 60 * 1000; // convert minutes to ms - if (warnInterval > 0 ) + int warnInterval = UpdaterSettings::self()->warnInterval() * 60 * 1000; // convert minutes to ms + if (warnInterval > 0 ) { QTimer *timer = new QTimer (this); connect (timer, SIGNAL(timeout()), this, SLOT(showPopup() )); timer->start(warnInterval,false); } - kDebug() << "Tray Icon ready" << endl; + kDebug() << "Tray Icon ready" << endl; } void TrayIcon::setState(int state, const QString &description ) { - kDebug() << "Set applet status to: " << state << endl; -// QToolTip::remove(this); + + + kDebug() << "Set applet status to: " << state << endl; + QToolTip::remove(this); appletState = state; switch (state) - { + { case APPLET_CHECKING: if (UpdaterSettings::self()->checkingAnimation()) -//TODO setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_CHECKING, KIconLoader::Panel) )); - setPixmap(loadIcon(TRAY_ICON_CHECKING)); + setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_CHECKING, KIconLoader::Panel) )); QToolTip::add(this, i18n("Checking for updates...")); break; - case APPLET_PROBLEM: + case APPLET_PROBLEM: setPixmap(loadIcon(TRAY_ICON_PROBLEM)); QToolTip::add(this, "<qt>" + i18n("Error:\n") + description + "</qt>" ); break; @@ -113,15 +113,14 @@ break; case APPLET_PKGMGR_UPDATES: - case APPLET_CRITICAL_UPDATES: + case APPLET_CRITICAL_UPDATES: QToolTip::add(this, i18n("New software updates are available.")); setPixmap(loadIcon(TRAY_ICON_RED)); showPopup(); break; case APPLET_INSTALLING: -//TODO setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_INSTALLING, KIconLoader::Panel) )); - setPixmap(loadIcon(TRAY_ICON_CHECKING)); + setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_INSTALLING, KIconLoader::Panel) )); QToolTip::add(this, i18n("Updating...")); break; @@ -135,12 +134,12 @@ void TrayIcon::showPopup() { - if ( (appletState == APPLET_UPDATES || - appletState == APPLET_CRITICAL_UPDATES ) && UpdaterSettings::self()->showNotifications() ) - { - QToolTip::add(this, i18n("New software for your system is available")); - popup->show(); - } + if ( (appletState == APPLET_UPDATES || + appletState == APPLET_CRITICAL_UPDATES ) && UpdaterSettings::self()->showNotifications() ) + { + QToolTip::add(this, i18n("New software for your system is available")); + popup->show(); + } } Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.h Thu Dec 6 20:23:23 2007 @@ -20,7 +20,7 @@ #ifndef _TRAY_ICON_H_ #define _TRAY_ICON_H_ -#include +#include #include "progresspopup.h" /** @@ -35,7 +35,7 @@ @author Narayan Newton **/ -class TrayIcon : public KSystemTrayIcon { +class TrayIcon : public KSystemTray { Q_OBJECT Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/Updater.h Thu Dec 6 20:23:23 2007 @@ -20,7 +20,7 @@ #ifndef _UPDATER_H_ #define _UPDATER_H_ -#include <QObject> +#include #include #include #include "Constants.h" @@ -47,16 +47,16 @@ Constants that define the various states our applet can be in. **/ enum { - APPLET_NO_UPDATES, /** No updates **/ - APPLET_UPDATES, /** Updates available **/ - APPLET_CRITICAL_UPDATES, /** Updates available (security) **/ - APPLET_CHECKING, /** Checking for updates **/ - APPLET_PROBLEM, /** Problem **/ - APPLET_INSTALLING, /** Installing patches or packages **/ - APPLET_PKGMGR_UPDATES, /** Updates available that affect the package manager **/ - APPLET_UNKNOWN, /** Unknown update status: No repositories are known to zypper **/ - APPLET_ONLY_OPTIONAL_UPDATES, /** Only optional updates are available (for trayicon) **/ - APPLET_NO_NETWORK /** No Network connection available **/ + APPLET_NO_UPDATES, /** No updates **/ + APPLET_UPDATES, /** Updates available **/ + APPLET_CRITICAL_UPDATES, /** Updates available (security) **/ + APPLET_CHECKING, /** Checking for updates **/ + APPLET_PROBLEM, /** problem **/ + APPLET_INSTALLING, /** installing patches or packages **/ + APPLET_PKGMGR_UPDATES, /** Updates available that affect the package manager **/ + APPLET_UNKNOWN, /** Unknown update status: No repositories are known to zypper **/ + APPLET_ONLY_OPTIONAL_UPDATES, /** Only optional updates are available (for trayicon) **/ + APPLET_NO_NETWORK /** No Network connection available **/ }; /** @@ -98,6 +98,7 @@ **/ void updateAppletError( const QString &desc ); + // TODO void setProgress(int step, int totalSteps, QString labelText); void setProgressNextStep(QString labelText); void showProgress(bool visible); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp Thu Dec 6 20:23:23 2007 @@ -4,7 +4,7 @@ #include //Added by qt3to4: #include <QShowEvent> -#include <Q3GridLayout> +#include #include <QPixmap> #include #include "Constants.h" @@ -37,13 +37,12 @@ // ------------------- Header -------------------------- QLabel *suseLogo = new QLabel(this); - QPixmap *pic = new QPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeHuge)); suseLogo->setPixmap(*pic); headline = new QLabel(centralWidget); headline->setText(i18n("<b>New software for your system is available</b>")); - headline->setAlignment(Qt::TextSingleLine); + headline->setAlignment(Qt::SingleLine); layout->addMultiCellWidget(suseLogo,0,1,0,0); layout->addMultiCellWidget(headline,0,0,1,3); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/CMakeLists.txt?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/CMakeLists.txt Thu Dec 6 20:23:23 2007 @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/updater ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/updater ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) ########### next target ############### @@ -13,12 +13,7 @@ KDE4_ADD_PLUGIN(opensuseupdater_zypp ${opensuseupdater_zypp_PART_SRCS}) TARGET_LINK_LIBRARIES(opensuseupdater_zypp ${QT_AND_KDECORE_LIBS} opensuseupdater ) INSTALL(TARGETS opensuseupdater_zypp DESTINATION ${KDE4_LIB_INSTALL_DIR}/kde3 ) - - -########### install files ############### - INSTALL_FILES( /share/services FILES opensuseupdater_zypp.desktop ) - INSTALL( PROGRAMS zypper_install DESTINATION /usr/sbin Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppListItem.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppListItem.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppListItem.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppListItem.h Thu Dec 6 20:23:23 2007 @@ -20,7 +20,7 @@ #ifndef _ZYPP_LIST_ITEM_H_ #define _ZYPP_LIST_ITEM_H_ -#include +#include #include /** @@ -37,12 +37,12 @@ **/ class ZYppListItem : //public QListViewItem - public QCheckListItem + public Q3CheckListItem { public: - ZYppListItem( ZYppResolvable *, QListView *, const QString& ); + ZYppListItem( ZYppResolvable *, Q3ListView *, const QString& ); ZYppResolvable * resolvable() const; private: Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.h Thu Dec 6 20:23:23 2007 @@ -22,6 +22,9 @@ #include "Updater.h" #include +//Added by qt3to4: +#include <Q3ValueList> +#include <Q3PtrList> /** @file @@ -109,7 +112,7 @@ @param updateList the list on the main window */ - void populateLists(QListView* patchList, QListView* packageList, bool displayProgress = false); + void populateLists(Q3ListView* patchList, Q3ListView* packageList, bool displayProgress = false); /** Slot which gets called when the user selects an update. @@ -118,7 +121,7 @@ @param item the update itself */ - void resolvableSelected(QListViewItem* item, int); + void resolvableSelected(Q3ListViewItem* item, int); /** Slot which gets called when the user right clicks an update. @@ -126,7 +129,7 @@ @param updateItem the update itself. @param point where to show the menu */ - void updateMenu(QListViewItem* item, const QPoint& point); + void updateMenu(Q3ListViewItem* item, const QPoint& point); /** Slot which gets called 1 minute after CheckForUpdates @@ -171,17 +174,17 @@ // parsed data, cleared between calls // to checkpatches - QPtrList<ZYppResolvable> _resolvables; - QValueList<ZYppSource> _sources; + Q3PtrList<ZYppResolvable> _resolvables; + Q3ValueList<ZYppSource> _sources; ZYppSource _current_source; XmlState _state; //We hold the QListView passed in "populateUpdateList" here - QListView *tempList; + Q3ListView *tempList; //This holds the currently selected update in the list - QListViewItem *currentUpdate; + Q3ListViewItem *currentUpdate; //Holds the descript for the currently selected update ZYppResolvable *_current_resolvable; @@ -189,8 +192,8 @@ int _update_counter; int totalUpdateCount; - QListView *_patchList; - QListView *_packageList; + Q3ListView *_patchList; + Q3ListView *_packageList; bool _found_update_status_tag; bool _last_xml_parse_code; bool _error; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdaterPreferencesModule.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdaterPreferencesModule.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdaterPreferencesModule.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdaterPreferencesModule.h Thu Dec 6 20:23:23 2007 @@ -40,4 +40,4 @@ void slotModified(); }; -#endif +#endif \ No newline at end of file Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.h?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.h Thu Dec 6 20:23:23 2007 @@ -1,4 +1,6 @@ #include "qdialog.h" +//Added by qt3to4: +#include <QLabel> #ifndef LICENSEDIALOG_H Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/zyppupdaterpreferences_base.ui URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/zyppupdaterpreferences_base.ui?rev=8054&r1=8053&r2=8054&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/zyppupdaterpreferences_base.ui (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/zyppupdaterpreferences_base.ui Thu Dec 6 20:23:23 2007 @@ -1,71 +1,60 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>ZYppUpdaterPreferences_Base</class> -<widget class="QWidget"> - <property name="name"> - <cstring>ZYppUpdaterPreferences_Base</cstring> +<ui version="4.0" stdsetdef="1" > + <author></author> + <comment></comment> + <exportmacro></exportmacro> + <class>ZYppUpdaterPreferences_Base</class> + <widget class="QWidget" name="ZYppUpdaterPreferences_Base" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>109</height> + </rect> </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>109</height> - </rect> - </property> - <property name="caption"> - <string>Form1</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout1</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QDial"> - <property name="name"> - <cstring>kcfg_Priority</cstring> - </property> - <property name="minValue"> - <number>-20</number> - </property> - <property name="maxValue"> - <number>19</number> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="text"> - <string>Update checking process priority</string> - </property> - </widget> - </hbox> - </widget> - <spacer> - <property name="name"> - <cstring>spacer1</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>16</height> - </size> - </property> + <layout class="QVBoxLayout" > + <item> + <layout class="QHBoxLayout" > + <item> + <widget class="QDial" name="kcfg_Priority" > + <property name="minimum" > + <number>-20</number> + </property> + <property name="maximum" > + <number>19</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="textLabel1" > + <property name="text" > + <string>Update checking process priority</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="spacer1" > + <property name="sizeHint" > + <size> + <width>20</width> + <height>16</height> + </size> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="orientation" > + <enum>Qt::Qt::Vertical</enum> + </property> </spacer> - </vbox> -</widget> -<layoutdefaults spacing="6" margin="11"/> -</UI> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11" /> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> +</ui> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org