Author: tgoettlicher Date: Thu Dec 6 15:40:31 2007 New Revision: 8051 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8051&view=rev Log: backup Modified: 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/ConfigWidget.cpp 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/TrayIcon.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdaterApplication.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdAdvancedConfig.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdConfigWindow.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdDependencyDialog.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdEditServers.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdInstallWindow.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdProgressDialog.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdRugParser.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdServerDialog.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdater.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.cpp 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.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.cpp branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.h branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdaterPreferencesModule.h 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.cpp Thu Dec 6 15:40:31 2007 @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -35,7 +35,7 @@ **/ //small macro taken from HTTP IOSlave -#define KIO_ARGS QByteArray packedArgs; QDataStream kioArgsStream( packedArgs, IO_WriteOnly ); kioArgsStream +#define KIO_ARGS QByteArray packedArgs; QDataStream kioArgsStream( packedArgs, QIODevice::WriteOnly ); kioArgsStream #define ZMD_UNIX_SOCKET "/var/run/zmd/zmd-web.socket" #define BUFFER_SIZE 6000 @@ -64,17 +64,17 @@ QString xmlMarkup = markupCall( method, args ); QByteArray postData; - QDataStream stream( postData, IO_WriteOnly ); + QDataStream stream( postData, QIODevice::WriteOnly ); stream.writeRawBytes( xmlMarkup.utf8(), xmlMarkup.utf8().length() ); sd = socket(AF_UNIX, SOCK_STREAM, 0); if (sd < 0) { - kdError() << "Can't create unix socket." << endl; + kError() << "Can't create unix socket." << endl; return; } - kdDebug() << "socket created" << endl; + kDebug() << "socket created" << endl; memset(&serveraddr, 0, sizeof(serveraddr)); serveraddr.sun_family = AF_UNIX; @@ -83,18 +83,18 @@ rc = ::connect(sd, (struct sockaddr *)&serveraddr, SUN_LEN(&serveraddr)); if (rc < 0) { - kdError() << "Can't connect unix socket." << endl; + kError() << "Can't connect unix socket." << endl; return; } - kdDebug() << "socket connected" << endl; + kDebug() << "socket connected" << endl; rc = send(sd, postData.data(), postData.size(), 0); if (rc < 0) { - kdError() << "Can't send." << endl; + kError() << "Can't send." << endl; return; } - kdDebug() << "sent " << rc << " bytes" << endl; + kDebug() << "sent " << rc << " bytes" << endl; bytesReceived = 0; @@ -105,24 +105,24 @@ if (rc < 0) { - kdError() << "Can't receive" << endl; + kError() << "Can't receive" << endl; return; } else if (rc == 0) { - kdError() << "Server closed connection" << endl; + kError() << "Server closed connection" << endl; return; } bytesReceived += rc; - kdDebug() << "Received " << bytesReceived << " bytes" << endl; + kDebug() << "Received " << bytesReceived << " bytes" << endl; if (sd != -1) close(sd); QString data_s = QString::fromUtf8( buffer, bytesReceived ); - kdDebug() << "got: " << endl << data_s << endl; + kDebug() << "got: " << endl << data_s << endl; QDomDocument doc; QString errMsg; int errLine, errCol; @@ -251,7 +251,7 @@ return markup; } default: - kdWarning() << "Failed to marshal unknown variant type: " << arg.type() << endl; + kWarning() << "Failed to marshal unknown variant type: " << arg.type() << endl; }; return QString::null; } @@ -300,7 +300,7 @@ } return QVariant( map ); } else { - kdWarning() << "Cannot demarshal unknown type " << typeName << endl; + kWarning() << "Cannot demarshal unknown type " << typeName << endl; } return QVariant(); } 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcquery.h Thu Dec 6 15:40:31 2007 @@ -12,7 +12,7 @@ #ifndef _KXML_RPC_QUERY_H_ #define _KXML_RPC_QUERY_H_ -#include +#include #include #include 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.cpp Thu Dec 6 15:40:31 2007 @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -30,7 +30,7 @@ **/ -KXmlRpcServer::KXmlRpcServer( const KURL &url, QObject *parent, const char *name ) : QObject( parent, name ) { +KXmlRpcServer::KXmlRpcServer( const KUrl &url, QObject *parent, const char *name ) : QObject( parent, name ) { if ( url.isValid() ) m_url = url; @@ -53,9 +53,9 @@ query->deleteLater(); } -void KXmlRpcServer::setUrl( const KURL &url ) { +void KXmlRpcServer::setUrl( const KUrl &url ) { - m_url = url.isValid() ? url : KURL(); + m_url = url.isValid() ? url : KUrl(); } void KXmlRpcServer::call( const QString &method, const QValueList<QVariant> &args, @@ -63,7 +63,7 @@ QObject* faultObj, const char* faultSlot, const QVariant &id ) { if ( m_url.isEmpty() ) - kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl; + 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 ); 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/kxmlrpcclient/kxmlrpcserver.h Thu Dec 6 15:40:31 2007 @@ -42,7 +42,7 @@ extensively to handle different arguments. @code - KXmlRpcServer *serv = new KXmlRpcServer(KURL("http://localhost"), this); + KXmlRpcServer *serv = new KXmlRpcServer(KUrl("http://localhost"), this); serv->setUserAgent("Test/1.0"); serv->call("xmlrpc.command1", "Hi!", this, SLOT(gotData(const QValueList<QVariant>&, const QVariant)), @@ -80,7 +80,7 @@ **/ - KXmlRpcServer( const KURL &url, QObject *parent = 0, const char *name = 0 ); + KXmlRpcServer( const KUrl &url, QObject *parent = 0, const char *name = 0 ); /** @@ -97,7 +97,7 @@ **/ - const KURL &url() const { return m_url; } + const KUrl &url() const { return m_url; } /** Sets the url for the xml-rpc server @@ -107,7 +107,7 @@ **/ - void setUrl( const KURL &url ); + void setUrl( const KUrl &url ); /** Gets the current user agent @@ -230,7 +230,7 @@ private: - KURL m_url; + KUrl m_url; QString m_userAgent; QValueList mPendingQueries; 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=8051&r1=8050&r2=8051&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 15:40:31 2007 @@ -4,11 +4,11 @@ #include <iostream> using namespace std; -#define KIO_ARGS QByteArray packedArgs; QDataStream stream( packedArgs, IO_WriteOnly ); stream +#define KIO_ARGS QByteArray packedArgs; QDataStream stream( packedArgs, QIODevice::WriteOnly ); stream UDSTest::UDSTest(QObject *parent) : QObject(parent) { - KURL url = "udshttp:/var/tmp/kzmd-http"; + 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); if (!job) { 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.cpp Thu Dec 6 15:40:31 2007 @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,17 +46,17 @@ { KInstance instance( "kio_udshttp" ); - kdDebug(DEBUGCODE) << "*** Starting kio_udshttp " << endl; + kDebug(DEBUGCODE) << "*** Starting kio_udshttp " << endl; if (argc != 4) { - kdDebug(DEBUGCODE) << "Usage: kio_udshttp protocol domain-socket1 domain-socket2" << endl; + kDebug(DEBUGCODE) << "Usage: kio_udshttp protocol domain-socket1 domain-socket2" << endl; exit(-1); } kio_udshttpProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); - kdDebug(DEBUGCODE) << "*** kio_udshttp Done" << endl; + kDebug(DEBUGCODE) << "*** kio_udshttp Done" << endl; return 0; } } @@ -90,8 +90,8 @@ void kio_udshttpProtocol::special(const QByteArray &data) { int tmp; - KURL url; - QDataStream stream(data, IO_ReadOnly); + KUrl url; + QDataStream stream(data, QIODevice::ReadOnly); stream >> tmp; switch (tmp) { @@ -110,7 +110,7 @@ } -void kio_udshttpProtocol::post(const KURL& url) { +void kio_udshttpProtocol::post(const KUrl& url) { m_url = url; @@ -139,7 +139,7 @@ getSocketResponse(); } -void kio_udshttpProtocol::get(const KURL& url ) { +void kio_udshttpProtocol::get(const KUrl& url ) { m_url = url; @@ -154,7 +154,7 @@ getSocketResponse(); } -void kio_udshttpProtocol::head(const KURL& url) { +void kio_udshttpProtocol::head(const KUrl& url) { m_url = url; @@ -169,7 +169,7 @@ getSocketResponse(); } -void kio_udshttpProtocol::mimetype(const KURL& url) { +void kio_udshttpProtocol::mimetype(const KUrl& url) { head(url); data(QCString(m_contentType.local8Bit())); data(QByteArray()); @@ -201,7 +201,7 @@ void kio_udshttpProtocol::httpCloseConnection() { QByteArray data; - QDataStream stream( data, IO_WriteOnly ); + QDataStream stream( data, QIODevice::WriteOnly ); stream << int(99); // special: Close connection //if socket is not already NULL and we are done with the connection @@ -317,7 +317,7 @@ m_reqLine = "HEAD "; break; } - if (m_realPath.isEmpty() == true && m_realPath.stripWhiteSpace() == "") { + if (m_realPath.isEmpty() == true && m_realPath.trimmed() == "") { m_reqLine += "/index.html"; } else { m_reqLine += m_realPath; @@ -365,7 +365,7 @@ } void kio_udshttpProtocol::parseResponse() { - QTextStream stream(m_outputData, IO_ReadOnly); + QTextStream stream(m_outputData, QIODevice::ReadOnly); QStringList tokens; QString line; unsigned int size; @@ -414,7 +414,7 @@ break; } default: - kdError(DEBUGCODE) << "ERROR: " << tokens[2] << endl; + kError(DEBUGCODE) << "ERROR: " << tokens[2] << endl; return; } @@ -426,13 +426,13 @@ } else if (tokens[0] == "Content-Type:") { tokens.erase(tokens.begin()); m_contentType += tokens.join(" "); - kdWarning(DEBUGCODE) << "Content type is: " << m_contentType << endl; + kWarning(DEBUGCODE) << "Content type is: " << m_contentType << endl; continue; } else if (tokens[0] == "Content-Size:") { size = tokens[1].toUInt(); } else if (tokens[0] == "Connection:") { if (tokens[1] == "close") - kdWarning(DEBUGCODE) << "Got a close" << endl; + kWarning(DEBUGCODE) << "Got a close" << endl; m_connectionDone = true; } } 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/udshttp/udshttp.h Thu Dec 6 15:40:31 2007 @@ -69,14 +69,14 @@ @param url the url we are checking. */ - virtual void mimetype(const KURL& url); + virtual void mimetype(const KUrl& url); /** Gets the document at the specified url. @param url the url that represents the doc we are fetching. */ - virtual void get(const KURL& url); + virtual void get(const KUrl& url); /** The handler for "special" functions, those specific to our slave. @@ -90,14 +90,14 @@ @param url the actual url we will be uploading too */ - virtual void post(const KURL& url); + virtual void post(const KUrl& url); /** Executes an HTTP_HEAD for the given url. This is used by mimetype. @param url the actual url we will be checking. */ - virtual void head(const KURL& url); + virtual void head(const KUrl& url); /** Close the connection, force close. @@ -126,7 +126,7 @@ KSocket *m_socket; bool m_connectionDone; - KURL m_url; + KUrl m_url; QString m_realSocketUrl; QString m_realPath; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/ConfigWidget.cpp Thu Dec 6 15:40:31 2007 @@ -95,7 +95,7 @@ void ConfigWidget::slotPluginComboChanged(int index) { - kdDebug() << "combo changed" << endl; + kDebug() << "combo changed" << endl; kcfg_BackendPlugin->setText(pluginMap[index]); } 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/HeaderWidget.cpp Thu Dec 6 15:40:31 2007 @@ -34,8 +34,8 @@ // layout = new QHBoxLayout(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)); + text = new QLabel(this, "headline", Qt::TextSingleLine); + pic = new QPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeHuge)); text->setText(i18n("<h2>Available Updates</h2>")); pic->setOptimization(QPixmap::BestOptim); 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/MainWindow.cpp Thu Dec 6 15:40:31 2007 @@ -25,11 +25,11 @@ #include <Q3HBoxLayout> #include <Q3VBoxLayout> #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -89,8 +89,8 @@ _edit_sources_action->plug(applet->contextMenu(), 1); _configure_applet_action->plug(applet->contextMenu(), 2);; _check_updates_action->plug(applet->contextMenu(), 3);; - _hide_action = KStdAction::close (this, SLOT(hide()), actionCollection(), 0); - _quit_action = KStdAction::quit(this, SLOT(slotExit()), actionCollection(), 0); + _hide_action = KStandardAction::close (this, SLOT(hide()), actionCollection(), 0); + _quit_action = KStandardAction::quit(this, SLOT(slotExit()), actionCollection(), 0); connect(this, SIGNAL(updateApplet(int, int, int)), this, SLOT(slotAppletState(int, int, int))); connect(this, SIGNAL(updateAppletError(const QString &)), this, SLOT(slotAppletError(const QString &))); @@ -118,7 +118,7 @@ centralWidget = new QWidget( this ); setCentralWidget( centralWidget ); - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = KIconLoader::global(); setIcon(loader->loadIcon(PROGRAM_NAME, KIcon::Small)); mainBox = new Q3VBoxLayout(centralWidget); @@ -208,9 +208,9 @@ buttonsLayout = new Q3HBoxLayout(mainBox); configureButton = new KPushButton(i18n("Add/Remove Update Repositories..."), centralWidget); - installButton = new KPushButton(KStdGuiItem::ok(), centralWidget); + installButton = new KPushButton(KStandardGuiItem::ok(), centralWidget); installButton->setText(i18n("Install")); - cancelButton = new KPushButton(KStdGuiItem::cancel(), centralWidget); + cancelButton = new KPushButton(KStandardGuiItem::cancel(), centralWidget); buttonsLayout->addWidget(configureButton, false, Qt::AlignLeft); buttonsLayout->addSpacing(250); @@ -330,8 +330,8 @@ void MainWindow::slotAppletError(const QString &desc) { - kdDebug() << "Applet error, description: " << desc << endl; - kdDebug() << "Applet error, description length: " << desc.length() << endl; + kDebug() << "Applet error, description: " << desc << endl; + kDebug() << "Applet error, description length: " << desc.length() << endl; applet->setUpdates(0); applet->setState(APPLET_PROBLEM, desc); @@ -346,8 +346,8 @@ void MainWindow::slotPluginError(const QString &desc) { - kdDebug() << "Applet error, description: " << desc << endl; - kdDebug() << "Applet error, description length: " << desc.length() << endl; + kDebug() << "Applet error, description: " << desc << endl; + kDebug() << "Applet error, description length: " << desc.length() << endl; applet->setUpdates(0); applet->setState(APPLET_PROBLEM, desc); @@ -504,7 +504,7 @@ void MainWindow::populateDone() { - kdDebug() << "populateDone()" << endl; + kDebug() << "populateDone()" << endl; updateButtons(); @@ -788,16 +788,16 @@ ConnectionManager::self()->status() != NetworkStatus::NoNetworks ) { ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdatesWithoutProgress())); - kdDebug() << "No network available" << endl; - kdDebug() << "Waiting for network connection..." << endl; + kDebug() << "No network available" << endl; + kDebug() << "Waiting for network connection..." << endl; slotAppletState(APPLET_NO_NETWORK, 0, 0); return; } ConnectionManager::self()->forgetConnectSlot(); - kdDebug() << "Network connection available." << endl; + kDebug() << "Network connection available." << endl; - kdDebug() << "Checking for updates..." << endl; + kDebug() << "Checking for updates..." << endl; patchDescription->setText(""); packageDescription->setText(""); @@ -875,7 +875,7 @@ void MainWindow::showSimpleView() { - kdDebug() << "showSimpleView" << endl; + kDebug() << "showSimpleView" << endl; _simple->show(); _simple->raise(); } 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/TrayIcon.cpp Thu Dec 6 15:40:31 2007 @@ -69,12 +69,12 @@ timer->start(warnInterval,false); } - kdDebug() << "Tray Icon ready" << endl; + kDebug() << "Tray Icon ready" << endl; } void TrayIcon::setState(int state, const QString &description ) { - kdDebug() << "Set applet status to: " << state << endl; + kDebug() << "Set applet status to: " << state << endl; // QToolTip::remove(this); appletState = state; switch (state) @@ -120,7 +120,7 @@ break; case APPLET_INSTALLING: -//TODO setMovie(QMovie( KGlobal::iconLoader()->moviePath(TRAY_ICON_INSTALLING, KIcon::Panel) )); +//TODO setMovie(QMovie( KIconLoader::global()->moviePath(TRAY_ICON_INSTALLING, KIconLoader::Panel) )); setPixmap(loadIcon(TRAY_ICON_CHECKING)); QToolTip::add(this, i18n("Updating...")); break; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdaterApplication.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdaterApplication.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdaterApplication.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/UpdaterApplication.cpp Thu Dec 6 15:40:31 2007 @@ -96,12 +96,12 @@ if (nextCheck < 30) nextCheck = 30; - kdDebug() << "LastCheck: " << lastCheckTime << endl; - kdDebug() << "now: " << now << endl; - kdDebug() << "interval: " << interval << endl; - kdDebug() << "interval s:" << interval * 60 * 60 << endl; - kdDebug() << "sec diff : " << lastCheckTime.secsTo(now) << endl; - kdDebug() << "nextCheck: " << nextCheck << endl; + kDebug() << "LastCheck: " << lastCheckTime << endl; + kDebug() << "now: " << now << endl; + kDebug() << "interval: " << interval << endl; + kDebug() << "interval s:" << interval * 60 * 60 << endl; + kDebug() << "sec diff : " << lastCheckTime.secsTo(now) << endl; + kDebug() << "nextCheck: " << nextCheck << endl; // clear last check time UpdaterSettings::self()->setLastCheckTime(QDateTime()); @@ -120,7 +120,7 @@ if (plugin && errCode == 0 ) { _updater = plugin; - kdDebug() << "Backend plugin \"" << service->name() << "\" loaded." << endl; + kDebug() << "Backend plugin \"" << service->name() << "\" loaded." << endl; return true; } else @@ -158,7 +158,7 @@ void UpdaterApplication::slotConfigChanged() { - kdDebug() << "Config has changed. Reloading backend plugin..." << endl; + kDebug() << "Config has changed. Reloading backend plugin..." << endl; connectToPlugin(); } @@ -168,7 +168,7 @@ int pluginCount=0; KService::Ptr service; - kdDebug() << "Searching for desired backend plugin \"" << backendName << "\" ..." << endl; + kDebug() << "Searching for desired backend plugin \"" << backendName << "\" ..." << endl; KTrader::OfferList offers = KTrader::self()->query("openSUSEUpdater/Backend"); KTrader::OfferList::ConstIterator iter; @@ -181,12 +181,12 @@ service = *iter; pluginCount++; - kdDebug() << "Found backend plugin \"" << service->name() << "\"" << endl; + kDebug() << "Found backend plugin \"" << service->name() << "\"" << endl; if (service->name() == backendName) return service; } - kdDebug() << "Unable to find desired backend plugin!" << endl; + kDebug() << "Unable to find desired backend plugin!" << endl; // ---------------------------------------------------------- // error, if no Plugin found @@ -204,14 +204,14 @@ if ( backendName != DEFAULT_BACKEND ) { - kdDebug() << "Trying with default (" << DEFAULT_BACKEND << ") ... " << endl; + kDebug() << "Trying with default (" << DEFAULT_BACKEND << ") ... " << endl; KService::Ptr backend; backend = selectPlugin(DEFAULT_BACKEND); if (backend != NULL) { - kdDebug() << "default backend found. " << endl; + kDebug() << "default backend found. " << endl; UpdaterSettings::self()->setBackendPlugin(DEFAULT_BACKEND); UpdaterSettings::self()->writeConfig(); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.cpp Thu Dec 6 15:40:31 2007 @@ -34,13 +34,13 @@ #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include "DummyUpdater.h" #include "MainWindow.h" @@ -60,9 +60,9 @@ { // For ease announce that we have been loaded. - kdDebug() << "DummyUpdater plugin loaded" << endl; + kDebug() << "DummyUpdater plugin loaded" << endl; - kdDebug() << "Initializing dummy backend" << endl; + kDebug() << "Initializing dummy backend" << endl; doCheckForUpdates(); } @@ -73,7 +73,7 @@ return caps; } -void DummyUpdater::slotYOUProcessExited( KProcess *p ) +void DummyUpdater::slotYOUProcessExited( K3Process *p ) { delete p; _you_process = 0L; @@ -81,7 +81,7 @@ } -void DummyUpdater::slotInstSourceProcessExited( KProcess *p ) +void DummyUpdater::slotInstSourceProcessExited( K3Process *p ) { delete p; } @@ -164,7 +164,7 @@ void DummyUpdater::doCheckForUpdates() { - kdDebug() << "Starting check for updates ..." << endl; + kDebug() << "Starting check for updates ..." << endl; emit(updateApplet(APPLET_CHECKING, 0, 0)); @@ -176,7 +176,7 @@ void DummyUpdater::populateLists(Q3ListView *patchList, Q3ListView *packageList) { - kdDebug() << "got populate UI request..." << endl; + kDebug() << "got populate UI request..." << endl; _patchList = patchList; _packageList = packageList; emit(updateApplet(APPLET_NO_UPDATES, 0, 0)); @@ -188,33 +188,33 @@ { if ( _you_process != 0L ) { - kdDebug() << "yast already running" << endl; + kDebug() << "yast already running" << endl; return; } - _you_process = new KProcess; + _you_process = new K3Process; *_you_process << "opensuseupdater-su" << "-c" << "/sbin/yast2 online_update"; - connect( _you_process, SIGNAL( processExited( KProcess * ) ), - SLOT( slotYOUProcessExited( KProcess * ) ) ); - _you_process->start( KProcess::NotifyOnExit ); + connect( _you_process, SIGNAL( processExited( K3Process * ) ), + SLOT( slotYOUProcessExited( K3Process * ) ) ); + _you_process->start( K3Process::NotifyOnExit ); } void DummyUpdater::configureUpdater() { - KProcess *inst_source = new KProcess; + K3Process *inst_source = new K3Process; *inst_source << "opensuseupdater-su" << "-c" << "/sbin/yast2 inst_source"; - connect( inst_source, SIGNAL( processExited( KProcess * ) ), - SLOT( slotInstSourceProcessExited( KProcess * ) ) ); - inst_source->start( KProcess::NotifyOnExit ); + connect( inst_source, SIGNAL( processExited( K3Process * ) ), + SLOT( slotInstSourceProcessExited( K3Process * ) ) ); + inst_source->start( K3Process::NotifyOnExit ); } void DummyUpdater::resolvableSelected(Q3ListViewItem *item, int resolvableType) { // retrieve description - kdDebug() << "updating item" << endl; + kDebug() << "updating item" << endl; if (resolvableType == RESOLVABLE_PATCH) emit(returnDescription("This path does nothing.", RESOLVABLE_PATCH)); else Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.h?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy/DummyUpdater.h Thu Dec 6 15:40:31 2007 @@ -96,13 +96,13 @@ protected slots: - void slotYOUProcessExited( KProcess * ); - void slotInstSourceProcessExited( KProcess * ); + void slotYOUProcessExited( K3Process * ); + void slotInstSourceProcessExited( K3Process * ); void showLog(); - void slotProcessExited( KProcess *proc ); - void slotReceivedStdout(KProcess *proc, char *buffer, int buflen); - void slotReceivedStderr(KProcess *proc, char *buffer, int buflen); + void slotProcessExited( K3Process *proc ); + void slotReceivedStdout(K3Process *proc, char *buffer, int buflen); + void slotReceivedStderr(K3Process *proc, char *buffer, int buflen); private: @@ -111,13 +111,13 @@ void doCheckForUpdates(); - KProcess *_process; + K3Process *_process; QString _buffer; QString _stderr_buffer; QString _error_message_buffer; - KProcess *_you_process; + K3Process *_you_process; //We hold the QListView passed in "populateUpdateList" here QListView *tempList; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.cpp Thu Dec 6 15:40:31 2007 @@ -34,13 +34,13 @@ #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include "DummyUpdater.h" #include "MainWindow.h" @@ -60,9 +60,9 @@ { // For ease announce that we have been loaded. - kdDebug() << "DummyUpdater plugin loaded" << endl; + kDebug() << "DummyUpdater plugin loaded" << endl; - kdDebug() << "Initializing dummy backend" << endl; + kDebug() << "Initializing dummy backend" << endl; doCheckForUpdates(); } @@ -74,7 +74,7 @@ return caps; } -void DummyUpdater::slotYOUProcessExited( KProcess *p ) +void DummyUpdater::slotYOUProcessExited( K3Process *p ) { delete p; _you_process = 0L; @@ -82,7 +82,7 @@ } -void DummyUpdater::slotInstSourceProcessExited( KProcess *p ) +void DummyUpdater::slotInstSourceProcessExited( K3Process *p ) { delete p; } @@ -166,7 +166,7 @@ void DummyUpdater::doCheckForUpdates() { - kdDebug() << "Starting check for updates ..." << endl; + kDebug() << "Starting check for updates ..." << endl; emit(updateApplet(APPLET_CHECKING, 0, 0)); @@ -178,7 +178,7 @@ void DummyUpdater::populateLists(Q3ListView *patchList, Q3ListView *packageList) { - kdDebug() << "got populate UI request..." << endl; + kDebug() << "got populate UI request..." << endl; _patchList = patchList; _packageList = packageList; emit(updateApplet(APPLET_NO_UPDATES, 0, 0)); @@ -190,33 +190,33 @@ { if ( _you_process != 0L ) { - kdDebug() << "yast already running" << endl; + kDebug() << "yast already running" << endl; return; } - _you_process = new KProcess; + _you_process = new K3Process; *_you_process << "opensuseupdater-su" << "-c" << "/sbin/yast2 online_update"; - connect( _you_process, SIGNAL( processExited( KProcess * ) ), - SLOT( slotYOUProcessExited( KProcess * ) ) ); - _you_process->start( KProcess::NotifyOnExit ); + connect( _you_process, SIGNAL( processExited( K3Process * ) ), + SLOT( slotYOUProcessExited( K3Process * ) ) ); + _you_process->start( K3Process::NotifyOnExit ); } void DummyUpdater::configureUpdater() { - KProcess *inst_source = new KProcess; + K3Process *inst_source = new K3Process; *inst_source << "opensuseupdater-su" << "-c" << "/sbin/yast2 inst_source"; - connect( inst_source, SIGNAL( processExited( KProcess * ) ), - SLOT( slotInstSourceProcessExited( KProcess * ) ) ); - inst_source->start( KProcess::NotifyOnExit ); + connect( inst_source, SIGNAL( processExited( K3Process * ) ), + SLOT( slotInstSourceProcessExited( K3Process * ) ) ); + inst_source->start( K3Process::NotifyOnExit ); } void DummyUpdater::resolvableSelected(Q3ListViewItem *item, int resolvableType) { // retrieve description - kdDebug() << "updating item" << endl; + kDebug() << "updating item" << endl; if (resolvableType == RESOLVABLE_PATCH) emit(returnDescription("This path does nothing.", RESOLVABLE_PATCH)); else Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.h?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/dummy_with_packages/DummyUpdater.h Thu Dec 6 15:40:31 2007 @@ -96,13 +96,13 @@ protected slots: - void slotYOUProcessExited( KProcess * ); - void slotInstSourceProcessExited( KProcess * ); + void slotYOUProcessExited( K3Process * ); + void slotInstSourceProcessExited( K3Process * ); void showLog(); - void slotProcessExited( KProcess *proc ); - void slotReceivedStdout(KProcess *proc, char *buffer, int buflen); - void slotReceivedStderr(KProcess *proc, char *buffer, int buflen); + void slotProcessExited( K3Process *proc ); + void slotReceivedStdout(K3Process *proc, char *buffer, int buflen); + void slotReceivedStderr(K3Process *proc, char *buffer, int buflen); private: @@ -111,13 +111,13 @@ void doCheckForUpdates(); - KProcess *_process; + K3Process *_process; QString _buffer; QString _stderr_buffer; QString _error_message_buffer; - KProcess *_you_process; + K3Process *_you_process; //We hold the QListView passed in "populateUpdateList" here QListView *tempList; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/main.cpp Thu Dec 6 15:40:31 2007 @@ -40,7 +40,7 @@ KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) { - kdError() << argv[0] << " is already running" << endl; + kError() << argv[0] << " is already running" << endl; exit(0); } UpdaterApplication app; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/progresspopup.cpp Thu Dec 6 15:40:31 2007 @@ -23,7 +23,7 @@ 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)); + QPixmap *pic = new QPixmap(KIconLoader::global()->loadIcon(PROGRAM_ICON, KIconLoader::Panel, KIconLoader::SizeLarge)); logo->setPixmap(*pic); captionLabel->setText(i18n("<b>Updating ...<b>")); packageLabel->setText(""); 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=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/simpleview.cpp Thu Dec 6 15:40:31 2007 @@ -43,7 +43,7 @@ headline = new QLabel(centralWidget); headline->setText(i18n("<b>New software for your system is available</b>")); - headline->setAlignment(Qt::SingleLine); + headline->setAlignment(Qt::TextSingleLine); layout->addMultiCellWidget(suseLogo,0,1,0,0); layout->addMultiCellWidget(headline,0,0,1,3); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdAdvancedConfig.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdAdvancedConfig.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdAdvancedConfig.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdAdvancedConfig.cpp Thu Dec 6 15:40:31 2007 @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -37,6 +37,7 @@ #include //Added by qt3to4: #include <Q3GridLayout> +#include #include "ZmdRugParser.h" #include "ZmdUpdaterCore.h" @@ -345,8 +346,8 @@ { #ifdef DEBUG - kdWarning() << "Setting changed" << endl; - kdWarning() << setting << " " << value << endl; + kWarning() << "Setting changed" << endl; + kWarning() << setting << " " << value << endl; #endif saveProc = new Q3Process(QString("rug"), this); @@ -370,7 +371,7 @@ void ZmdAdvancedConfig::hostUrlChange() { - KConfig *config = kapp->config(); + KConfig *config = KGlobal::config(); config->setGroup("General"); saveSettings("bind-ip", hostEdit->text()); @@ -434,7 +435,7 @@ if (settingName == "remote-enabled") { - KConfig *config = kapp->config(); + KConfig *config = KGlobal::config(); config->setGroup("General"); config->writeEntry("ZmdProto", ((settingValue == true) ? ZMD_TCP : ZMD_UDS)); if (settingValue == true) @@ -507,7 +508,7 @@ else // the else case here is really only going to be true once byteData = proc->readStderr(); data = new QString(byteData); - if (data->stripWhiteSpace() != "") + if (data->trimmed() != "") { KMessageBox::error(this, *data); } @@ -533,7 +534,7 @@ proc = new Q3Process(QString("rug"), this); proc->addArgument("restart"); proc->start(); - kdWarning() << "Restarting ZMD" << endl; + kWarning() << "Restarting ZMD" << endl; } } Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdConfigWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdConfigWindow.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdConfigWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdConfigWindow.cpp Thu Dec 6 15:40:31 2007 @@ -56,7 +56,7 @@ tabs = new QTabWidget(this); editServers = new ZmdEditServers(core, tabs); advancedConfig = new ZmdAdvancedConfig(core, tabs); - closeButton = new KPushButton(KStdGuiItem::close(), this); + closeButton = new KPushButton(KStandardGuiItem::close(), this); mainLayout->addWidget(header, 0, 0); mainLayout->addWidget(tabs, 0, 0); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdDependencyDialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdDependencyDialog.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdDependencyDialog.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdDependencyDialog.cpp Thu Dec 6 15:40:31 2007 @@ -39,8 +39,8 @@ { mainLayout = new Q3VBoxLayout(this); - okButton = new KPushButton(KStdGuiItem::ok(), this); - cancelButton = new KPushButton(KStdGuiItem::cancel(), this); + okButton = new KPushButton(KStandardGuiItem::ok(), this); + cancelButton = new KPushButton(KStandardGuiItem::cancel(), this); packages = new KTextEdit(this); mainLayout->addWidget(packages); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdEditServers.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdEditServers.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdEditServers.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdEditServers.cpp Thu Dec 6 15:40:31 2007 @@ -169,7 +169,7 @@ if (serverList->firstChild()->childCount() != 1) { - kdWarning() << "ERROR: We are trying to add catalogs to a list that already has them or has not had a service drop yet" << endl; + kWarning() << "ERROR: We are trying to add catalogs to a list that already has them or has not had a service drop yet" << endl; return; } Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdInstallWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdInstallWindow.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdInstallWindow.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdInstallWindow.cpp Thu Dec 6 15:40:31 2007 @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdProgressDialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdProgressDialog.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdProgressDialog.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdProgressDialog.cpp Thu Dec 6 15:40:31 2007 @@ -20,7 +20,7 @@ #include "ZmdProgressDialog.h" #include -#include +#include #include #include Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdRugParser.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdRugParser.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdRugParser.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdRugParser.cpp Thu Dec 6 15:40:31 2007 @@ -52,7 +52,7 @@ data = data.remove(0,data.find("bind-ip")); data = data.replace('\n', "|"); - data = data.simplifyWhiteSpace(); + data = data.simplified(); QStringList props; props = QStringList::split("|", data); @@ -62,8 +62,8 @@ QString value = *(++iter); QString description = *(++iter); - propertyMap.insert(name.stripWhiteSpace(), new QString(value.stripWhiteSpace())); - descriptionMap.insert(name.stripWhiteSpace(), new QString(description.simplifyWhiteSpace())); + propertyMap.insert(name.trimmed(), new QString(value.trimmed())); + descriptionMap.insert(name.trimmed(), new QString(description.simplified())); } } Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdServerDialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdServerDialog.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdServerDialog.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdServerDialog.cpp Thu Dec 6 15:40:31 2007 @@ -92,8 +92,8 @@ QRadioButton *mButton = new QRadioButton("Mount", typeGroup); QRadioButton *nButton = new QRadioButton(i18n("NU Server"), typeGroup); QRadioButton *rButton = new QRadioButton(i18n("RCE Server"), typeGroup); - cancelButton = new KPushButton(KStdGuiItem::cancel(), this); - addButton = new KPushButton(KStdGuiItem::add(), this); + cancelButton = new KPushButton(KStandardGuiItem::cancel(), this); + addButton = new KPushButton(KStandardGuiItem::add(), this); layout->addWidget(nameLabel, 0, 0); layout->addWidget(nameEdit, 0, 0); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdater.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdater.cpp Thu Dec 6 15:40:31 2007 @@ -17,12 +17,12 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include #include -#include +#include #include #include @@ -36,6 +36,7 @@ #include #include #include +#include #include "ZmdUpdater.h" #include "MainWindow.h" @@ -51,7 +52,7 @@ //setXMLFile("plugindemo_capitalizeui.rc"); // For ease announce that we have been loaded. - kdDebug() << "ZmdUpdater plugin loaded" << endl; + kDebug() << "ZmdUpdater plugin loaded" << endl; //Init and auth the core @@ -297,7 +298,7 @@ QValueList<PackageLock>::iterator iter; if (tempList == NULL || tempList->childCount() == 0) { - kdWarning() << "List empty or null" << endl; + kWarning() << "List empty or null" << endl; return; } @@ -308,7 +309,7 @@ item->setText(COLUMN_NAME, item->text(COLUMN_NAME) + " (Package Held)"); } else if (tempList != NULL) { //We have a lock without a package attached to it - kdWarning() << "Lock without a package" << endl; + kWarning() << "Lock without a package" << endl; } } } @@ -522,7 +523,7 @@ { QString serverIP; - KConfig *config = kapp->config(); + KConfig *config = KGlobal::config(); config->setGroup("General"); //switch (config->readEntry("ZmdProto").toInt()) @@ -556,7 +557,7 @@ int fd; char buffer[1024]; - KProcess proc; + K3Process proc; Q3CString pass; struct pollfd pfd; int count; @@ -568,7 +569,7 @@ proc << QString("kzmdauthutil ") + QString(ZMD_CONFIG_PATH); if (proc.start() == false) { - kdError() << "Could not start authutil" << endl; + kError() << "Could not start authutil" << endl; authorizeCore(); } @@ -586,7 +587,7 @@ if (poll(&pfd, 1, 2*(1000*60)) < 0) { - kdError() << "We timed out waiting for the root password" << endl; + kError() << "We timed out waiting for the root password" << endl; exit(1); } @@ -598,7 +599,7 @@ list = QStringList::split("\n", data); if (list.count() != 2) { - kdError() << "Could not read the pass file" << endl; + kError() << "Could not read the pass file" << endl; exit(1); } for (QStringList::iterator iter = list.begin(); iter != list.end(); iter++) @@ -606,12 +607,12 @@ if (iter == list.begin()) { core->setUser((*iter).ascii()); - kdWarning() << (*iter).ascii() << endl; + kWarning() << (*iter).ascii() << endl; } else { core->setPass((*iter).ascii()); - kdWarning() << (*iter).ascii() << endl; + kWarning() << (*iter).ascii() << endl; } } close(fd); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.cpp Thu Dec 6 15:40:31 2007 @@ -33,7 +33,7 @@ ZmdUpdaterCore::ZmdUpdaterCore(QObject *parent) : QObject(parent) { - server = new KXmlRpcServer(KURL()); + server = new KXmlRpcServer(KUrl()); server->setUserAgent("ZMDUPDATER/0.1"); timer = new QTimer(this); @@ -55,7 +55,7 @@ void ZmdUpdaterCore::setUser(QString user) { - KURL url(server->url()); + KUrl url(server->url()); username = user; //we never actually use this url.setUser(user); @@ -64,7 +64,7 @@ void ZmdUpdaterCore::setPass(QString pass) { - KURL url(server->url()); + KUrl url(server->url()); password = pass; //we never actually use this url.setPass(pass); @@ -84,7 +84,7 @@ void ZmdUpdaterCore::slotPong(const Q3ValueList<QVariant>&, const QVariant&) { - kdDebug() << "pong?" << endl; + kDebug() << "pong?" << endl; emit pong(); } @@ -162,12 +162,12 @@ * ********************************************************************/ -void ZmdUpdaterCore::setServer(KURL url) +void ZmdUpdaterCore::setServer(KUrl url) { QString user; QString pass; - KURL serverUrl; + KUrl serverUrl; serverUrl = server->url(); user = serverUrl.user(); @@ -188,7 +188,7 @@ void ZmdUpdaterCore::getServices() { IS_ZMD_BUSY; - kdDebug() << k_funcinfo << endl; + kDebug() << k_funcinfo << endl; server->call("zmd.system.service_list", Q3ValueList<QVariant>(), this, SLOT(serviceData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); @@ -220,7 +220,7 @@ //Data slot, returning information from xml-rpc void ZmdUpdaterCore::serviceData(const Q3ValueList<QVariant>& data, const QVariant& t) { - kdDebug() << k_funcinfo << endl; + kDebug() << k_funcinfo << endl; if (data.front().canCast(QVariant::String) == true && data.front().toString().isEmpty() != true) { //We get a string back and its not empty, must have come from adding a service @@ -250,7 +250,7 @@ if (data.front().toString() == "") { #ifdef DEBUG - kdWarning() << "Service Removed" << endl; + kWarning() << "Service Removed" << endl; #endif emit(serviceRemoved()); } @@ -266,7 +266,7 @@ void ZmdUpdaterCore::getCatalogs() { IS_ZMD_BUSY; - kdDebug() << k_funcinfo << endl; + kDebug() << k_funcinfo << endl; server->call("zmd.system.catalog_list", Q3ValueList<QVariant>(), this, SLOT(catalogData(const Q3ValueList<QVariant>&, const QVariant&)), this, SLOT(faultData(int, const QString&, const QVariant&))); @@ -300,14 +300,14 @@ void ZmdUpdaterCore::catalogData(const Q3ValueList<QVariant>& data, const QVariant& t) { - kdDebug() << k_funcinfo << endl; + kDebug() << k_funcinfo << endl; if (data.front().canCast(QVariant::String) == true) { /* If we get a string back, it is from a catalog sub/unsub */ #ifdef DEBUG - kdWarning() << "Catalog Sub Changed" << endl; + kWarning() << "Catalog Sub Changed" << endl; #endif emit(catalogSubscriptionChanged()); } @@ -326,8 +326,8 @@ cat.fromMap(map); catalogList.append(cat); #ifdef DEBUG - kdWarning() << "Catalog Drop name: " << cat.name << endl; - kdWarning() << "Catalog service: " << cat.service << endl; + kWarning() << "Catalog Drop name: " << cat.name << endl; + kWarning() << "Catalog service: " << cat.service << endl; #endif } emit(catalogListing(catalogList)); @@ -401,8 +401,8 @@ patch.fromMap(map); patchList.append(patch); #ifdef DEBUG - kdWarning() << "Patch drop: " << patch.name << endl; - kdWarning() << "Patch ID: " << patch.id << endl; + kWarning() << "Patch drop: " << patch.name << endl; + kWarning() << "Patch ID: " << patch.id << endl; #endif } emit(patchListing(patchList)); @@ -596,9 +596,9 @@ map = lock.toMap(); #ifdef DEBUG - kdWarning() << "Lock info we are sending: " << endl; - kdWarning() << (map["dependency"].toMap())["id"].toString() << endl; - kdWarning() << map["catalog"].toString() << endl; + kWarning() << "Lock info we are sending: " << endl; + kWarning() << (map["dependency"].toMap())["id"].toString() << endl; + kWarning() << map["catalog"].toString() << endl; #endif wrapper.append(map); @@ -644,7 +644,7 @@ Q3ValueList<PackageLock> lockList; #ifdef DEBUG - kdWarning() << "got a list of locks" << endl; + kWarning() << "got a list of locks" << endl; #endif list = data.front().toList(); for (Q3ValueList<QVariant>::iterator iter = list.begin(); iter != list.end(); iter++) @@ -655,9 +655,9 @@ lock.fromMap(map); #ifdef DEBUG - kdWarning() << "Lock info: " << endl; - kdWarning() << lock.id << endl; - kdWarning() << lock.pack.name << endl; + kWarning() << "Lock info: " << endl; + kWarning() << lock.id << endl; + kWarning() << lock.pack.name << endl; #endif lockList.append(lock ); @@ -666,7 +666,7 @@ } else { - kdWarning() << "Got something in the lock data function that was not a list" << endl; + kWarning() << "Got something in the lock data function that was not a list" << endl; } } @@ -711,7 +711,7 @@ } #ifdef DEBUG - kdWarning() << "Asking for dep verification" << endl; + kWarning() << "Asking for dep verification" << endl; #endif server->call("zmd.packsys.verify", Q3ValueList<QVariant>(), this, SLOT(transactData(const Q3ValueList<QVariant>&, const QVariant&)), @@ -883,10 +883,10 @@ status.fromMap(map); #ifdef DEBUG - kdWarning() << "Status: " << status.status << endl; - kdWarning() << "Name: " << status.name << endl; - kdWarning() << "Percent: " << status.percent << endl; - kdWarning() << "Message: " << status.messages.front() << endl; + kWarning() << "Status: " << status.status << endl; + kWarning() << "Name: " << status.name << endl; + kWarning() << "Percent: " << status.percent << endl; + kWarning() << "Message: " << status.messages.front() << endl; #endif if (status.name == "Downloading Packages") @@ -1046,7 +1046,7 @@ break; } #ifdef DEBUG - kdError() << "Fault: " << message << endl; - kdError() << "Fault Code: " << code << endl; + kError() << "Fault: " << message << endl; + kError() << "Fault Code: " << code << endl; #endif } Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.h?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zmd/ZmdUpdaterCore.h Thu Dec 6 15:40:31 2007 @@ -92,7 +92,7 @@ @param url the address of the server **/ - void setServer(KURL url); + void setServer(KUrl url); /** User function for the temp authorization Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/ZYppUpdater.cpp Thu Dec 6 15:40:31 2007 @@ -35,12 +35,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "ZYppUpdater.h" #include "ZYppListItem.h" @@ -65,8 +65,8 @@ licenseDialog = new LicenseDialog(NULL); // For ease announce that we have been loaded. - kdDebug() << "ZyppUpdater plugin loaded" << endl; - kdDebug() << "Initializing zypp backend" << endl; + kDebug() << "ZyppUpdater plugin loaded" << endl; + kDebug() << "Initializing zypp backend" << endl; _xml_reader.setContentHandler(this); resetXmlStream(); @@ -80,16 +80,16 @@ return caps; } -void ZYppUpdater::slotInstallProcessExited( KProcess *p ) +void ZYppUpdater::slotInstallProcessExited( K3Process *p ) { - kdDebug() << "install process exited." << endl; + kDebug() << "install process exited." << endl; emit(showProgress(false)); handleMessages(); if (p->exitStatus() == 103 ) { - kdDebug() << "restarting now..." << endl; + kDebug() << "restarting now..." << endl; system("( sleep 2; opensuseupdater-kde ) & "); kapp->quit(); } @@ -170,7 +170,7 @@ return err; } -void ZYppUpdater::slotInstSourceProcessExited( KProcess *p ) +void ZYppUpdater::slotInstSourceProcessExited( K3Process *p ) { delete p; } @@ -178,14 +178,14 @@ void ZYppUpdater::showLog() {} -void ZYppUpdater::slotProcessExited( KProcess *proc ) +void ZYppUpdater::slotProcessExited( K3Process *proc ) { - kdDebug() << "check process finished..." << endl; - kdDebug() << _buffer << endl; + kDebug() << "check process finished..." << endl; + kDebug() << _buffer << endl; delete _process; _process = 0L; - kdDebug() << "ExitStatus: " << proc->exitStatus() << endl; + kDebug() << "ExitStatus: " << proc->exitStatus() << endl; if (proc->exitStatus() != 0 && @@ -218,7 +218,7 @@ if ( ! _patchList || !_packageList ) { - kdDebug() << " ! _patchList || ! _packageList " << endl; + kDebug() << " ! _patchList || ! _packageList " << endl; return; } @@ -229,7 +229,7 @@ bool critical_available=false; - kdDebug() << "populating... " << _resolvables.count() << " resolvables" << endl; + kDebug() << "populating... " << _resolvables.count() << " resolvables" << endl; for ( Q3PtrList<ZYppResolvable>::const_iterator it = _resolvables.begin(); it != _resolvables.end(); ++it ) { Q3CheckListItem *newItem; @@ -272,11 +272,11 @@ emit(showProgress(false)); } -void ZYppUpdater::slotReceivedStdout(KProcess *proc, char *buffer, int buflen) +void ZYppUpdater::slotReceivedStdout(K3Process *proc, char *buffer, int buflen) { if ( buflen <= 0 ) { - kdDebug() << "got empty buffer. Buffer stays at " << _xml_source.data().length() << endl; + kDebug() << "got empty buffer. Buffer stays at " << _xml_source.data().length() << endl; return; } @@ -288,12 +288,12 @@ if ( !_last_xml_parse_code ) { - kdDebug() << "Incremental parsing error. buffer size: " << _xml_source.data().length() << endl; - kdDebug() << errorString() << endl; + kDebug() << "Incremental parsing error. buffer size: " << _xml_source.data().length() << endl; + kDebug() << errorString() << endl; } } -void ZYppUpdater::slotReceivedStderr(KProcess *proc, char *buffer, int buflen) +void ZYppUpdater::slotReceivedStderr(K3Process *proc, char *buffer, int buflen) { _stderr_buffer += QString::fromUtf8( buffer, buflen ); } @@ -304,11 +304,11 @@ void ZYppUpdater::doCheckForUpdates() { - kdDebug() << "Checking for updates..." << endl; + kDebug() << "Checking for updates..." << endl; if ( _process ) { - kdDebug() << "Process still running. Will not run this time." << endl; + kDebug() << "Process still running. Will not run this time." << endl; emit(updateApplet(APPLET_CHECKING, 0, 0)); return; } @@ -317,21 +317,21 @@ _error=false; _noUpdateRepositories=false; - _process = new KProcess; + _process = new K3Process; *_process << "/usr/sbin/zypp-checkpatches-wrapper"; - QObject::connect( _process, SIGNAL( processExited( KProcess * ) ), - SLOT( slotProcessExited( KProcess * ) ) ); - QObject::connect( _process, SIGNAL( receivedStdout(KProcess *, char *, int ) ), - SLOT( slotReceivedStdout(KProcess *, char *, int ) ) ); - QObject::connect( _process, SIGNAL( receivedStderr(KProcess *, char *, int ) ), - SLOT( slotReceivedStderr(KProcess *, char *, int ) ) ); + QObject::connect( _process, SIGNAL( processExited( K3Process * ) ), + SLOT( slotProcessExited( K3Process * ) ) ); + QObject::connect( _process, SIGNAL( receivedStdout(K3Process *, char *, int ) ), + SLOT( slotReceivedStdout(K3Process *, char *, int ) ) ); + QObject::connect( _process, SIGNAL( receivedStderr(K3Process *, char *, int ) ), + SLOT( slotReceivedStderr(K3Process *, char *, int ) ) ); - bool result = _process->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + bool result = _process->start( K3Process::NotifyOnExit, K3Process::AllOutput ); if ( ! result ) { - kdDebug() << "error launching zypp-checkpatches-wrapper..." << endl; + kDebug() << "error launching zypp-checkpatches-wrapper..." << endl; emit(updateAppletError(i18n("Can't launch zypp-checkpatches-wrapper helper program. Make sure zypper package is installed and working."))); delete _process; _process = 0L; @@ -339,7 +339,7 @@ return; } - kdDebug() << "check process started.." << endl; + kDebug() << "check process started.." << endl; emit(updateApplet(APPLET_CHECKING, 0, 0)); if (!_silent) emit(showProgress(true)); @@ -347,7 +347,7 @@ void ZYppUpdater::populateLists(Q3ListView *patchList, Q3ListView *packageList, bool silent ) { - kdDebug() << "got populate UI request..." << endl; + kDebug() << "got populate UI request..." << endl; _patchList = patchList; _packageList = packageList; _silent = silent; @@ -358,7 +358,7 @@ void ZYppUpdater::resolvableSelected(Q3ListViewItem *item, int resolvableType) { // retrieve description - kdDebug() << "updating item" << endl; + kDebug() << "updating item" << endl; ZYppListItem *zi = dynamic_cast(item); if ( zi ) { @@ -378,7 +378,7 @@ if ( _process ) { // TODO update still running - kdDebug() << "Process still running. Will not run this time." << endl; + kDebug() << "Process still running. Will not run this time." << endl; return; } @@ -386,8 +386,8 @@ if (!_patchList || !_packageList) { - kdDebug() << "!_patchList || !_packageList!!! " << endl; - kdDebug() << "Install is not allowed yet" << endl; + kDebug() << "!_patchList || !_packageList!!! " << endl; + kDebug() << "Install is not allowed yet" << endl; return; } @@ -395,7 +395,7 @@ QStringList installPackageList; Q3CheckListItem *item = (Q3CheckListItem*)_patchList->firstChild(); - kdDebug() << "patchlist elements: " << _patchList->childCount() << endl; + kDebug() << "patchlist elements: " << _patchList->childCount() << endl; while (item != NULL) { @@ -406,8 +406,8 @@ { ZYppResolvable *patch = zi->resolvable(); - kdDebug() << patch->name << endl; - if ( patch->license.stripWhiteSpace().isEmpty()) + kDebug() << patch->name << endl; + if ( patch->license.trimmed().isEmpty()) installPatchList += item->text(); else { @@ -430,7 +430,7 @@ if ( zi ) { ZYppResolvable *package = zi->resolvable(); - if ( package->license.stripWhiteSpace().isEmpty()) + if ( package->license.trimmed().isEmpty()) installPackageList += item->text(); else { @@ -456,12 +456,12 @@ resetXmlStream(); _error=false; - kdDebug() << "_process" << endl; - _process = new KProcess; + kDebug() << "_process" << endl; + _process = new K3Process; - kdDebug() << "patches:" << installPatchList << endl; - kdDebug() << "packages:" << installPackageList << endl; + kDebug() << "patches:" << installPatchList << endl; + kDebug() << "packages:" << installPackageList << endl; @@ -470,17 +470,17 @@ *_process << command << "--patch" << installPatchList << "--package" << installPackageList; - QObject::connect( _process, SIGNAL( processExited( KProcess * ) ), - SLOT( slotInstallProcessExited( KProcess * ) ) ); - QObject::connect( _process, SIGNAL( receivedStdout(KProcess *, char *, int ) ), - SLOT( slotReceivedStdout(KProcess *, char *, int ) ) ); - QObject::connect( _process, SIGNAL( receivedStderr(KProcess *, char *, int ) ), - SLOT( slotReceivedStderr(KProcess *, char *, int ) ) ); + QObject::connect( _process, SIGNAL( processExited( K3Process * ) ), + SLOT( slotInstallProcessExited( K3Process * ) ) ); + QObject::connect( _process, SIGNAL( receivedStdout(K3Process *, char *, int ) ), + SLOT( slotReceivedStdout(K3Process *, char *, int ) ) ); + QObject::connect( _process, SIGNAL( receivedStderr(K3Process *, char *, int ) ), + SLOT( slotReceivedStderr(K3Process *, char *, int ) ) ); - bool result = _process->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + bool result = _process->start( K3Process::NotifyOnExit, K3Process::AllOutput ); if ( ! result ) { - kdDebug() << "error launching install process..." << endl; + kDebug() << "error launching install process..." << endl; emit(updateAppletError(i18n("Can't launch install helper program. Make sure zypper package is installed and working."))); delete _process; _process = 0L; @@ -488,7 +488,7 @@ return; } - kdDebug() << "install process started.." << endl; + kDebug() << "install process started.." << endl; emit(updateApplet(APPLET_INSTALLING, 0, 0)); emit(setProgress(0, 1, "")); emit(showProgress(true)); @@ -500,14 +500,14 @@ void ZYppUpdater::configureUpdater() { - kdDebug() << "configure updater" << endl; + kDebug() << "configure updater" << endl; - KProcess *inst_source = new KProcess; + K3Process *inst_source = new K3Process; *inst_source << "kdesu" << "-c" << "/sbin/yast2 inst_productsources"; - connect( inst_source, SIGNAL( processExited( KProcess * ) ), - SLOT( slotInstSourceProcessExited( KProcess * ) ) ); - inst_source->start( KProcess::NotifyOnExit ); + connect( inst_source, SIGNAL( processExited( K3Process * ) ), + SLOT( slotInstSourceProcessExited( K3Process * ) ) ); + inst_source->start( K3Process::NotifyOnExit ); } @@ -517,7 +517,7 @@ bool ZYppUpdater::startDocument() { - kdDebug() << "start document..." << endl; + kDebug() << "start document..." << endl; _found_update_status_tag = false; _error = false; _message = false; @@ -585,7 +585,7 @@ } if ( qName == "update" ) { - kdDebug() << "found patch..." << qName << endl; + kDebug() << "found patch..." << qName << endl; _current_resolvable = new ZYppResolvable(); _current_resolvable->name = atts.value("name"); _current_resolvable->category = atts.value("category"); @@ -631,7 +631,7 @@ bool ZYppUpdater::endDocument() { - kdDebug() << "end document" << endl; + kDebug() << "end document" << endl; return true; } @@ -666,10 +666,10 @@ if ( qName == "update" ) { _state = Unknown; - kdDebug() << _current_resolvable->name << " appended" << endl; + kDebug() << _current_resolvable->name << " appended" << endl; _resolvables.append(_current_resolvable); - kdDebug() << _current_resolvable->name << endl; + kDebug() << _current_resolvable->name << endl; return true; } 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=8051&r1=8050&r2=8051&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 15:40:31 2007 @@ -33,7 +33,7 @@ @author Thomas Goettlicher */ -class KProcess; +class K3Process; class LicenseDialog; @@ -137,15 +137,15 @@ protected slots: - void slotInstSourceProcessExited( KProcess * ); + void slotInstSourceProcessExited( K3Process * ); void showLog(); - void slotProcessExited( KProcess *proc ); - void slotReceivedStdout(KProcess *proc, char *buffer, int buflen); - void slotReceivedStderr(KProcess *proc, char *buffer, int buflen); + void slotProcessExited( K3Process *proc ); + void slotReceivedStdout(K3Process *proc, char *buffer, int buflen); + void slotReceivedStderr(K3Process *proc, char *buffer, int buflen); - void slotInstallProcessExited( KProcess * ); - void slotInstallReceivedStdout(KProcess *, char *, int ) ; + void slotInstallProcessExited( K3Process * ); + void slotInstallReceivedStdout(K3Process *, char *, int ) ; void resetXmlStream(); @@ -156,7 +156,7 @@ void doCheckForUpdates(); bool handleMessages(); - KProcess *_process; + K3Process *_process; QString _buffer; QString _stderr_buffer; 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=8051&r1=8050&r2=8051&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 15:40:31 2007 @@ -40,4 +40,4 @@ void slotModified(); }; -#endif \ No newline at end of file +#endif Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp/licensedialog.cpp Thu Dec 6 15:40:31 2007 @@ -22,8 +22,8 @@ license = new KTextEdit(this); license->setReadOnly(true); - KPushButton *cancelButton = new KPushButton(KStdGuiItem::cancel(), this); - KPushButton *okButton = new KPushButton(KStdGuiItem::ok(), this); + KPushButton *cancelButton = new KPushButton(KStandardGuiItem::cancel(), this); + KPushButton *okButton = new KPushButton(KStandardGuiItem::ok(), this); okButton->setText(i18n("Accept")); cancelButton->setText(i18n("Decline")); @@ -43,7 +43,7 @@ void LicenseDialog::setText(const QString &caption, const QString& text) { - kdDebug() << text << endl; + kDebug() << text << endl; headline->setText(caption); license->setText(text); license->setMinimumSize(600,300); Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.cpp?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.cpp (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.cpp Thu Dec 6 15:40:31 2007 @@ -33,12 +33,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "ZYppUpdater.h" #include "ZYppListItem.h" @@ -80,9 +80,9 @@ //setXMLFile("plugindemo_capitalizeui.rc"); // For ease announce that we have been loaded. - kdDebug() << "ZyppUpdater plugin loaded" << endl; + kDebug() << "ZyppUpdater plugin loaded" << endl; - kdDebug() << "Initializing zypp backend" << endl; + kDebug() << "Initializing zypp backend" << endl; } UpdaterCapabilities ZYppUpdater::capabilities() @@ -93,14 +93,14 @@ return caps; } -void ZYppUpdater::slotYOUProcessExited( KProcess *p ) +void ZYppUpdater::slotYOUProcessExited( K3Process *p ) { delete p; _you_process = 0L; doCheckForUpdates(); } -void ZYppUpdater::slotInstSourceProcessExited( KProcess *p ) +void ZYppUpdater::slotInstSourceProcessExited( K3Process *p ) { delete p; } @@ -109,10 +109,10 @@ { } -void ZYppUpdater::slotProcessExited( KProcess *proc ) +void ZYppUpdater::slotProcessExited( K3Process *proc ) { - kdDebug() << "check process finished..." << endl; - kdDebug() << _buffer << endl; + kDebug() << "check process finished..." << endl; + kDebug() << _buffer << endl; delete _process; _process = 0L; // parse the xml @@ -126,7 +126,7 @@ /* if ( !_end_document_reached ) { - kdDebug() << "Houston, we have a problem." << endl; + kDebug() << "Houston, we have a problem." << endl; if ( _buffer.isEmpty() && !_stderr_buffer.isEmpty() ) updateAppletError( i18n("helper program returned:\n%1").arg(_stderr_buffer) ); else @@ -145,7 +145,7 @@ if ( ! _patchList || !_packageList ) { - kdDebug() << " ! _patchList || ! _packageList " << endl; + kDebug() << " ! _patchList || ! _packageList " << endl; return; } @@ -154,7 +154,7 @@ // TODO - kdDebug() << "populating... " << _patches.count() << " patches" << endl; + kDebug() << "populating... " << _patches.count() << " patches" << endl; for ( Q3PtrList<ZYppResolvable>::const_iterator it = _patches.begin(); it != _patches.end(); ++it ) { if ( (*it)->category != "optional" ) @@ -185,9 +185,9 @@ emit(populateDone()); } -void ZYppUpdater::slotReceivedStdout(KProcess *proc, char *buffer, int buflen) +void ZYppUpdater::slotReceivedStdout(K3Process *proc, char *buffer, int buflen) { - kdDebug() << "got..." << endl; + kDebug() << "got..." << endl; // add stdout to a buffer // we can parse it when process finishes _buffer += QString::fromUtf8( buffer, buflen ); @@ -195,7 +195,7 @@ -void ZYppUpdater::slotReceivedStderr(KProcess *proc, char *buffer, int buflen) +void ZYppUpdater::slotReceivedStderr(K3Process *proc, char *buffer, int buflen) { _stderr_buffer += QString::fromUtf8( buffer, buflen ); } @@ -207,30 +207,30 @@ void ZYppUpdater::doCheckForUpdates() { - kdDebug() << "Checking for updates..." << endl; + kDebug() << "Checking for updates..." << endl; if ( _process ) { - kdDebug() << "Check process still running. Will not run this time." << endl; + kDebug() << "Check process still running. Will not run this time." << endl; emit(updateApplet(APPLET_CHECKING, 0, 0)); return; } - _process = new KProcess; + _process = new K3Process; *_process << "/usr/sbin/zypp-checkpatches-wrapper"; - QObject::connect( _process, SIGNAL( processExited( KProcess * ) ), - SLOT( slotProcessExited( KProcess * ) ) ); - QObject::connect( _process, SIGNAL( receivedStdout(KProcess *, char *, int ) ), - SLOT( slotReceivedStdout(KProcess *, char *, int ) ) ); - QObject::connect( _process, SIGNAL( receivedStderr(KProcess *, char *, int ) ), - SLOT( slotReceivedStderr(KProcess *, char *, int ) ) ); + QObject::connect( _process, SIGNAL( processExited( K3Process * ) ), + SLOT( slotProcessExited( K3Process * ) ) ); + QObject::connect( _process, SIGNAL( receivedStdout(K3Process *, char *, int ) ), + SLOT( slotReceivedStdout(K3Process *, char *, int ) ) ); + QObject::connect( _process, SIGNAL( receivedStderr(K3Process *, char *, int ) ), + SLOT( slotReceivedStderr(K3Process *, char *, int ) ) ); - bool result = _process->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + bool result = _process->start( K3Process::NotifyOnExit, K3Process::AllOutput ); if ( ! result ) { - kdDebug() << "error launching zypp-checkpatches-wrapper..." << endl; + kDebug() << "error launching zypp-checkpatches-wrapper..." << endl; emit(updateAppletError(i18n("Can't launch zypp-checkpatches-wrapper helper program. Make sure zypper package is installed and working."))); // _list_view = 0L; delete _process; @@ -239,14 +239,14 @@ return; } - kdDebug() << "check process started.." << endl; + kDebug() << "check process started.." << endl; emit(updateApplet(APPLET_CHECKING, 0, 0)); //mStatusLabel->setText( i18n("Checking...") ); } void ZYppUpdater::populateLists(Q3ListView *patchList, Q3ListView *packageList ) { - kdDebug() << "got populate UI request..." << endl; + kDebug() << "got populate UI request..." << endl; _patchList = patchList; _packageList = packageList; emit(updateApplet(APPLET_NO_UPDATES, 0, 0)); @@ -258,7 +258,7 @@ void ZYppUpdater::resolvableSelected(Q3ListViewItem *item, int resolvableType) { // retrieve description - kdDebug() << "updating item" << endl; + kDebug() << "updating item" << endl; if (resolvableType == RESOLVABLE_PATCH) { //TODO @@ -279,36 +279,36 @@ { if ( _you_process != 0L ) { - kdDebug() << "yast already running" << endl; + kDebug() << "yast already running" << endl; return; } - _you_process = new KProcess; + _you_process = new K3Process; *_you_process << "opensuseupdater-su" << "-c" << "/sbin/yast2 online_update"; - connect( _you_process, SIGNAL( processExited( KProcess * ) ), - SLOT( slotYOUProcessExited( KProcess * ) ) ); - _you_process->start( KProcess::NotifyOnExit ); + connect( _you_process, SIGNAL( processExited( K3Process * ) ), + SLOT( slotYOUProcessExited( K3Process * ) ) ); + _you_process->start( K3Process::NotifyOnExit ); } void ZYppUpdater::configureUpdater() { - kdDebug() << "configure updater" << endl; + kDebug() << "configure updater" << endl; - KProcess *inst_source = new KProcess; + K3Process *inst_source = new K3Process; *inst_source << "opensuseupdater-su" << "-c" << "/sbin/yast2 inst_source"; - connect( inst_source, SIGNAL( processExited( KProcess * ) ), - SLOT( slotInstSourceProcessExited( KProcess * ) ) ); - inst_source->start( KProcess::NotifyOnExit ); + connect( inst_source, SIGNAL( processExited( K3Process * ) ), + SLOT( slotInstSourceProcessExited( K3Process * ) ) ); + inst_source->start( K3Process::NotifyOnExit ); } // QXmlHandler stuff bool ZYppUpdater::startDocument() { - kdDebug() << "start document..." << endl; + kDebug() << "start document..." << endl; _found_update_status_tag = false; _end_document_reached = false; _error = false; @@ -341,7 +341,7 @@ // UpdateList, // here we have to allocate a patch or source in the stack - kdDebug() << "xml..." << qName << endl; + kDebug() << "xml..." << qName << endl; if ( qName == "update-status" ) { _found_update_status_tag = true; @@ -358,7 +358,7 @@ if ( qName == "update" ) { //TODO - kdDebug() << "found patch..." << qName << endl; + kDebug() << "found patch..." << qName << endl; _current_resolvable = new ZYppResolvable(); _current_resolvable->name = atts.value("name"); _current_resolvable->category = atts.value("category"); @@ -399,10 +399,10 @@ bool ZYppUpdater::endDocument() { _end_document_reached = true; - kdDebug() << "end document" << endl; + kDebug() << "end document" << endl; if ( ! _found_update_status_tag ) { - kdDebug() << "Wrong xml output" << endl; + kDebug() << "Wrong xml output" << endl; emit(updateAppletError(_buffer)); return false; } @@ -445,12 +445,12 @@ if ( _current_resolvable->kind == "patch" ) { _state = Unknown; - kdDebug() << _current_resolvable->name << " appended" << endl; + kDebug() << _current_resolvable->name << " appended" << endl; _patches.append(_current_resolvable); // ignore sources for now - kdDebug() << _current_resolvable->name << endl; - kdDebug() << _current_resolvable->summary << endl; + kDebug() << _current_resolvable->name << endl; + kDebug() << _current_resolvable->summary << endl; } return true; Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.h?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdater.h Thu Dec 6 15:40:31 2007 @@ -33,7 +33,7 @@ @author Thomas Goettlicher */ -class KProcess; +class K3Process; struct ZYppResolvable { @@ -127,13 +127,13 @@ protected slots: - void slotYOUProcessExited( KProcess * ); - void slotInstSourceProcessExited( KProcess * ); + void slotYOUProcessExited( K3Process * ); + void slotInstSourceProcessExited( K3Process * ); void showLog(); - void slotProcessExited( KProcess *proc ); - void slotReceivedStdout(KProcess *proc, char *buffer, int buflen); - void slotReceivedStderr(KProcess *proc, char *buffer, int buflen); + void slotProcessExited( K3Process *proc ); + void slotReceivedStdout(K3Process *proc, char *buffer, int buflen); + void slotReceivedStderr(K3Process *proc, char *buffer, int buflen); private: @@ -141,13 +141,13 @@ void doCheckForUpdates(); - KProcess *_process; + K3Process *_process; QString _buffer; QString _stderr_buffer; QString _error_message_buffer; - KProcess *_you_process; + K3Process *_you_process; // parsed data, cleared between calls // to checkpatches Modified: branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdaterPreferencesModule.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdaterPreferencesModule.h?rev=8051&r1=8050&r2=8051&view=diff ============================================================================== --- branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdaterPreferencesModule.h (original) +++ branches/tmp/tgoettlicher/updater-kde_qt4porting/updater/zypp_traditional/ZYppUpdaterPreferencesModule.h Thu Dec 6 15:40:31 2007 @@ -40,4 +40,4 @@ void slotModified(); }; -#endif \ No newline at end of file +#endif -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org