diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/CMakeLists.txt /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/CMakeLists.txt --- kde-nightly-kdesupport-20091204+svn1058683/attica/CMakeLists.txt 2009-12-04 23:36:44.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/CMakeLists.txt 2009-12-08 23:40:13.000000000 +0000 @@ -1,9 +1,9 @@ project(attica) -set(ATTICA_VERSION_MAJOR 0 CACHE INT "Major Attica version number" FORCE) -set(ATTICA_VERSION_MINOR 1 CACHE INT "Minor Attica version number" FORCE) -set(ATTICA_VERSION_PATCH 0 CACHE INT "Release Attica version number" FORCE) -set(ATTICA_VERSION_STRING "${ATTICA_VERSION_MAJOR}.${ATTICA_VERSION_MINOR}.${ATTICA_VERSION_PATCH}" CACHE STRING "Attica version string" FORCE) +set(CMAKE_LIBATTICA_VERSION_MAJOR 0 CACHE INT "Major Attica version number" FORCE) +set(CMAKE_LIBATTICA_VERSION_MINOR 1 CACHE INT "Minor Attica version number" FORCE) +set(CMAKE_LIBATTICA_VERSION_PATCH 1 CACHE INT "Release Attica version number" FORCE) +set(CMAKE_LIBATTICA_VERSION_STRING "${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH}" CACHE STRING "Attica version string" FORCE) cmake_minimum_required(VERSION 2.6) diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/atticabasejob.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/atticabasejob.cpp --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/atticabasejob.cpp 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/atticabasejob.cpp 2009-12-08 23:40:13.000000000 +0000 @@ -74,6 +74,7 @@ } emit finished(this); + d->m_reply->deleteLater(); deleteLater(); } @@ -83,13 +84,18 @@ QTimer::singleShot(0, this, SLOT(doWork())); } - void BaseJob::doWork() { d->m_reply = executeRequest(); connect(d->m_reply, SIGNAL(finished()), SLOT(dataFinished())); } +void BaseJob::abort() +{ + if (d->m_reply) { + d->m_reply->abort(); + } +} PlatformDependent* BaseJob::internals() { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/atticabasejob.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/atticabasejob.h --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/atticabasejob.h 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/atticabasejob.h 2009-12-08 23:40:13.000000000 +0000 @@ -46,6 +46,7 @@ public Q_SLOTS: void start(); + void abort(); Q_SIGNALS: void finished(Attica::BaseJob* job); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/CMakeLists.txt /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/CMakeLists.txt --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/CMakeLists.txt 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/CMakeLists.txt 2009-12-08 23:40:13.000000000 +0000 @@ -10,6 +10,8 @@ find_package(Qt4 REQUIRED) include_directories( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ) +configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h) + set(ocsclient_SRCS qtplatformdependent.cpp parser.cpp @@ -50,8 +52,8 @@ add_library(attica SHARED ${ocsclient_SRCS}) set_target_properties(attica PROPERTIES - VERSION ${ATTICA_VERSION_STRING} - SOVERSION ${ATTICA_VERSION_MAJOR} + VERSION ${CMAKE_LIBATTICA_VERSION_STRING} + SOVERSION ${CMAKE_LIBATTICA_VERSION_MAJOR} LINK_INTERFACE_LIBRARIES "" DEFINE_SYMBOL MAKE_ATTICA_LIB ) @@ -86,6 +88,7 @@ postjob.h providermanager.h provider.h + ${CMAKE_CURRENT_BINARY_DIR}/version.h DESTINATION include/attica COMPONENT Devel ) diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/platformdependent.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/platformdependent.h --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/platformdependent.h 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/platformdependent.h 2009-12-08 23:40:13.000000000 +0000 @@ -43,6 +43,7 @@ public: virtual ~PlatformDependent() {} virtual QList getDefaultProviderFiles() const = 0; + virtual bool hasCredentials(const QUrl& baseUrl) const = 0; virtual bool loadCredentials(const QUrl& baseUrl, QString& user, QString& password) = 0; virtual bool askForCredentials(const QUrl& baseUrl, QString& user, QString& password) = 0; virtual bool saveCredentials(const QUrl& baseUrl, const QString& user, const QString& password) = 0; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/provider.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/provider.cpp --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/provider.cpp 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/provider.cpp 2009-12-08 23:40:13.000000000 +0000 @@ -83,7 +83,7 @@ } QString user; QString pass; - if (m_internals->loadCredentials(m_baseUrl, user, pass)) { + if (m_internals->hasCredentials(m_baseUrl) && m_internals->loadCredentials(m_baseUrl, user, pass)) { m_credentialsUserName = user; m_credentialsPassword = pass; } @@ -101,7 +101,7 @@ } Provider::Provider(const Provider& other) - : QObject(), d(other.d) + : d(other.d) { } @@ -137,6 +137,20 @@ return d->m_name; } +bool Provider::hasCredentials() +{ + return d->m_internals->hasCredentials(d->m_baseUrl); +} + +bool Provider::loadCredentials(QString& user, QString& password) +{ + return d->m_internals->loadCredentials(d->m_baseUrl, user, password); +} + +bool Provider::saveCredentials(const QString& user, const QString& password) +{ + return d->m_internals->saveCredentials(d->m_baseUrl, user, password); +} PostJob* Provider::checkLogin(const QString& user, const QString& password) { @@ -623,6 +637,3 @@ { return new ListJob(d->m_internals, createRequest(url)); } - - -#include "provider.moc" diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/provider.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/provider.h --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/provider.h 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/provider.h 2009-12-08 23:40:13.000000000 +0000 @@ -64,10 +64,8 @@ * Accessing funtions of the Provider returns a Job class that * takes care of accessing the server and parsing the result. */ -class ATTICA_EXPORT Provider :public QObject +class ATTICA_EXPORT Provider { - Q_OBJECT - public: Provider(); Provider(const Provider& other); @@ -85,6 +83,10 @@ Downloads }; + bool hasCredentials(); + bool loadCredentials(QString& user, QString& password); + bool saveCredentials(const QString& user, const QString& password); + PostJob* checkLogin(const QString& user, const QString& password); // Person part of OCS diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/providermanager.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/providermanager.cpp --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/providermanager.cpp 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/providermanager.cpp 2009-12-08 23:40:13.000000000 +0000 @@ -165,6 +165,7 @@ { QNetworkReply* reply = d->m_downloads.take(url); parseProviderFile(reply->readAll(), url); + reply->deleteLater(); } void ProviderManager::addProviderFromXml(const QString& providerXml) @@ -172,7 +173,6 @@ parseProviderFile(providerXml, QString()); } - void ProviderManager::parseProviderFile(const QString& xmlString, const QString& url) { QXmlStreamReader xml(xmlString); @@ -244,11 +244,13 @@ QString user; QString password; if (auth->user().isEmpty() && auth->password().isEmpty()) { - if (d->m_internals->loadCredentials(baseUrl, user, password)) { - qDebug() << "ProviderManager::authenticate: loading authentication"; - auth->setUser(user); - auth->setPassword(password); - return; + if (d->m_internals->hasCredentials(baseUrl)) { + if (d->m_internals->loadCredentials(baseUrl, user, password)) { + qDebug() << "ProviderManager::authenticate: loading authentication"; + auth->setUser(user); + auth->setPassword(password); + return; + } } } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/qtplatformdependent.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/qtplatformdependent.cpp --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/qtplatformdependent.cpp 2009-12-04 23:36:44.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/qtplatformdependent.cpp 2009-12-08 23:40:13.000000000 +0000 @@ -46,6 +46,12 @@ } +bool QtPlatformDependent::hasCredentials(const QUrl& baseUrl) const +{ + return false; +} + + bool QtPlatformDependent::saveCredentials(const QUrl& baseUrl, const QString& user, const QString& password) { Q_UNUSED(baseUrl) diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/qtplatformdependent.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/qtplatformdependent.h --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/qtplatformdependent.h 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/qtplatformdependent.h 2009-12-08 23:40:13.000000000 +0000 @@ -38,6 +38,7 @@ virtual QNetworkReply* post(const QNetworkRequest& request, const QByteArray& data); virtual QNetworkReply* post(const QNetworkRequest& request, QIODevice* data); virtual QNetworkReply* get(const QNetworkRequest& request); + virtual bool hasCredentials(const QUrl& baseUrl) const; virtual bool saveCredentials(const QUrl& baseUrl, const QString& user, const QString& password); virtual bool loadCredentials(const QUrl& baseUrl, QString& user, QString& password); virtual bool askForCredentials(const QUrl& baseUrl, QString& user, QString& password); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/lib/version.h.cmake /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/lib/version.h.cmake --- kde-nightly-kdesupport-20091204+svn1058683/attica/lib/version.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/lib/version.h.cmake 2009-12-08 23:40:13.000000000 +0000 @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2007 Sebastian Trueg + * Copyright (C) 2009 Frederik Gladhorn + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _ATTICA_VERSION_H_ +#define _ATTICA_VERSION_H_ + +#include "atticaclient_export.h" + +/// @brief Attica version as string at compile time. +#define LIBATTICA_VERSION_STRING "${CMAKE_LIBATTICA_VERSION_STRING}" + +/// @brief The major Attica version number at compile time +#define LIBATTICA_VERSION_MAJOR ${CMAKE_LIBATTICA_VERSION_MAJOR} + +/// @brief The minor Attica version number at compile time +#define LIBATTICA_VERSION_MINOR ${CMAKE_LIBATTICA_VERSION_MINOR} + +/// @brief The Attica release version number at compile time +#define LIBATTICA_VERSION_RELEASE ${CMAKE_LIBATTICA_VERSION_RELEASE} + +/** + * \brief Create a unique number from the major, minor and release number of a %Attica version + * + * This function can be used for preprocessing. For version information at runtime + * use the version methods in the Attica namespace. + */ +#define LIBATTICA_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) + +/** + * \brief %Attica Version as a unique number at compile time + * + * This macro calculates the %Attica version into a number. It is mainly used + * through LIBATTICA_IS_VERSION in preprocessing. For version information at runtime + * use the version methods in the Attica namespace. + */ +#define LIBATTICA_VERSION \ + LIBATTICA_MAKE_VERSION(LIBATTICA_VERSION_MAJOR,LIBATTICA_VERSION_MINOR,LIBATTICA_VERSION_RELEASE) + +/** + * \brief Check if the %Attica version matches a certain version or is higher + * + * This macro is typically used to compile conditionally a part of code: + * \code + * #if LIBATTICA_IS_VERSION(2,1) + * // Code for Attica 2.1 + * #else + * // Code for Attica 2.0 + * #endif + * \endcode + * + * For version information at runtime + * use the version methods in the Attica namespace. + */ +#define LIBATTICA_IS_VERSION(a,b,c) ( LIBATTICA_VERSION >= LIBATTICA_MAKE_VERSION(a,b,c) ) + + +namespace Attica { + /** + * @brief Returns the major number of Attica's version, e.g. + * 1 for %Attica 1.0.2. + * @return the major version number at runtime. + */ + ATTICA_EXPORT unsigned int versionMajor(); + + /** + * @brief Returns the minor number of Attica's version, e.g. + * 0 for %Attica 1.0.2. + * @return the minor version number at runtime. + */ + ATTICA_EXPORT unsigned int versionMinor(); + + /** + * @brief Returns the release of Attica's version, e.g. + * 2 for %Attica 1.0.2. + * @return the release number at runtime. + */ + ATTICA_EXPORT unsigned int versionRelease(); + + /** + * @brief Returns the %Attica version as string, e.g. "1.0.2". + * + * On contrary to the macro LIBATTICA_VERSION_STRING this function returns + * the version number of Attica at runtime. + * @return the %Attica version. You can keep the string forever + */ + ATTICA_EXPORT const char* versionString(); +} + +#endif diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/attica/Mainpage.dox /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/attica/Mainpage.dox --- kde-nightly-kdesupport-20091204+svn1058683/attica/Mainpage.dox 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdesupport-20091208+svn1060445/attica/Mainpage.dox 2009-12-08 23:40:13.000000000 +0000 @@ -0,0 +1,11 @@ +/** @mainpage The LibAttica API Reference + +Attica is a Qt library that implements the Open Collaboration Services API version 1.4. +The REST API is defined here: + http://www.freedesktop.org/wiki/Specifications/open-collaboration-services + +*/ +// DOXYGEN_VERSION=4.0 +// DOXYGEN_NAME=attica +// DOXYGEN_ENABLE=YES +// DOXYGEN_SET_RECURSIVE = YES diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/debian/changelog /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/debian/changelog --- kde-nightly-kdesupport-20091204+svn1058683/debian/changelog 2009-12-04 23:38:11.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/debian/changelog 2009-12-08 23:41:43.000000000 +0000 @@ -1,8 +1,8 @@ -kde-nightly-kdesupport (20091204+svn1058683-0neon1) jaunty; urgency=low +kde-nightly-kdesupport (20091208+svn1060445-0neon1) jaunty; urgency=low * Nightly Build - -- Project Neon Fri, 04 Dec 2009 18:38:10 -0500 + -- Project Neon Tue, 08 Dec 2009 18:41:43 -0500 kde-nightly-kdesupport (20080303-0amarok1) gutsy; urgency=low diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/bin/Source/GitSource.py /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/bin/Source/GitSource.py --- kde-nightly-kdesupport-20091204+svn1058683/emerge/bin/Source/GitSource.py 2009-12-04 23:36:44.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/bin/Source/GitSource.py 2009-12-08 23:40:14.000000000 +0000 @@ -81,7 +81,7 @@ ( file, patchdepth ) = self.subinfo.patchesToApply() if file: patchfile = os.path.join ( self.packageDir(), file ) - return self.shell.execute( self.sourceDir(), "git", "apply %s" % self.shell.toNativePath(patchfile) ) + return self.shell.execute( self.sourceDir(), "git", "apply -p %s %s" % (patchdepth, self.shell.toNativePath(patchfile)) ) return True def createPatch( self ): diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/kdeenv-user.bat /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/kdeenv-user.bat --- kde-nightly-kdesupport-20091204+svn1058683/emerge/kdeenv-user.bat 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/kdeenv-user.bat 2009-12-08 23:40:14.000000000 +0000 @@ -0,0 +1 @@ +runas /profile /user:kde-devel "%comspec% /e:on /C cd %CD% && %CD%\kdeenv.bat" \ No newline at end of file diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/kde-4.3/kdelibs/kdelibs-4.3.4.diff /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/kde-4.3/kdelibs/kdelibs-4.3.4.diff --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/kde-4.3/kdelibs/kdelibs-4.3.4.diff 2009-12-04 23:36:46.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/kde-4.3/kdelibs/kdelibs-4.3.4.diff 2009-12-08 23:40:15.000000000 +0000 @@ -10,3 +10,165 @@ #include #include "dom/dom2_range.h" #include "dom/html_document.h" +--- kdelibs-4.3.4.orig/kinit/kinit_win.cpp ++++ kdelibs-4.3.4/kinit/kinit_win.cpp +@@ -4,6 +4,7 @@ + * (c) 1999 Mario Weilguni + * (c) 2001 Lubos Lunak + * (c) 2006 Ralf Habacker ++ * (c) 2009 Patrick Spendrin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -29,6 +30,7 @@ + #include + + #include ++#include + #include + + +@@ -40,6 +42,7 @@ + #include + #include + #include ++#include + + //#define ENABLE_SUICIDE + //#define ENABLE_EXIT +@@ -56,18 +59,31 @@ + + class ProcessListEntry { + public: +- ProcessListEntry(HANDLE _handle,char *_path, int _pid ) ++ ProcessListEntry( HANDLE _handle,char *_path, int _pid, K_UID _owner ) + { + QFileInfo p(_path); + path = p.absolutePath(); + name = p.baseName(); + handle = _handle; +- pid = _pid; ++ pid = _pid; ++ DWORD length = GetLengthSid(_owner); ++ owner = (PSID) new BYTE[length]; ++ CopySid(length, owner, _owner); ++ owner = _owner; + } ++ ++ ~ProcessListEntry() ++ { ++ // don't know why this crashes here. ++ // delete owner; ++ owner = 0; ++ } ++ + QString name; + QString path; + int pid; + HANDLE handle; ++ K_UID owner; + friend QDebug operator <<(QDebug out, const ProcessListEntry &c); + }; + +@@ -89,7 +105,7 @@ + public: + ProcessList() {initProcessList(); } + ~ProcessList(); +- ProcessListEntry *hasProcessInList(const QString &name); ++ ProcessListEntry *hasProcessInList(const QString &name, K_UID owner=0 ); + bool terminateProcess(const QString &name); + QList &list() { return processList; } + private: +@@ -102,6 +118,12 @@ + void ProcessList::getProcessNameAndID( DWORD processID ) + { + char szProcessName[MAX_PATH]; ++ // by default use the current process' uid ++ KUser user; ++ K_UID processSid; ++ DWORD sidLength = GetLengthSid(user.uid()); ++ processSid = (PSID)new BYTE[sidLength]; ++ CopySid(sidLength, processSid, user.uid()); + + // Get a handle to the process. + +@@ -117,17 +139,47 @@ + HMODULE hMod; + DWORD cbNeeded; + +- if ( EnumProcessModules( hProcess, &hMod, sizeof(hMod), ++ if ( EnumProcessModules( hProcess, &hMod, sizeof(hMod), + &cbNeeded) ) +- { ++ { + ret = GetModuleFileNameExA( hProcess, hMod, szProcessName, + sizeof(szProcessName)/sizeof(TCHAR) ); +- } ++ } ++ ++ if (ret > 0) ++ { ++ HANDLE hToken = NULL; ++ ++ OpenProcessToken(hProcess, TOKEN_READ, &hToken); ++ if(hToken) ++ { ++ DWORD size; ++ PTOKEN_USER userStruct; ++ ++ // check how much space is needed ++ GetTokenInformation(hToken, TokenUser, NULL, 0, &size); ++ if( ERROR_INSUFFICIENT_BUFFER == GetLastError() ) ++ { ++ userStruct = reinterpret_cast( new BYTE[size] ); ++ GetTokenInformation(hToken, TokenUser, userStruct, size, &size); ++ ++ sidLength = GetLengthSid(userStruct->User.Sid); ++ delete processSid; ++ processSid = 0; ++ processSid = (PSID)new BYTE[sidLength]; ++ CopySid(sidLength, processSid, userStruct->User.Sid); ++ ++ CloseHandle(hToken); ++ delete [] userStruct; ++ } ++ } ++ } + } + if (ret > 0) + { +- processList << new ProcessListEntry(hProcess,szProcessName,processID ); ++ processList << new ProcessListEntry( hProcess, szProcessName, processID, processSid ); + } ++ delete processSid; + } + + +@@ -168,7 +220,7 @@ + /** + return process list entry of given name + */ +-ProcessListEntry *ProcessList::hasProcessInList(const QString &name) ++ProcessListEntry *ProcessList::hasProcessInList(const QString &name, K_UID owner) + { + ProcessListEntry *ple; + foreach(ple,processList) { +@@ -177,7 +229,17 @@ + continue; + } + if (ple->name == name || ple->name == name + ".exe") { +- return ple; ++ if(owner) ++ { ++ // owner is set ++ if(EqualSid(owner, ple->owner)) return ple; ++ } ++ else ++ { ++ // no owner is set, use the owner of this process ++ KUser user; ++ if(EqualSid(user.uid(), ple->owner)) return ple; ++ } + } + } + return NULL; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/libs/qt/qt-4.5.2.20090727.py /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/libs/qt/qt-4.5.2.20090727.py --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/libs/qt/qt-4.5.2.20090727.py 2009-12-04 23:36:45.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/libs/qt/qt-4.5.2.20090727.py 2009-12-08 23:40:14.000000000 +0000 @@ -86,9 +86,9 @@ configure = os.path.join( self.sourceDir(), "configure.exe" ).replace( "/", "\\" ) command = r"echo %s | %s -opensource -platform %s -prefix %s " \ - "-qt-gif -qt-libpng -qt-libjpeg -qt-libtiff -plugin-sql-mysql " \ + "-qt-gif -qt-libpng -qt-libjpeg -qt-libtiff -plugin-sql-mysql -plugin-sql-odbc " \ "-no-phonon -qdbus -openssl -dbus-linked " \ - "-fast -no-vcproj -no-dsp " \ + "-fast -ltcg -no-vcproj -no-dsp " \ "-nomake demos -nomake examples " \ "%s %s" % ( userin, configure, platform, self.installDir(), incdirs, libdirs) if self.buildType() == "Debug": diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/testing/koffice/koffice-2.0.0.20090529.py /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/testing/koffice/koffice-2.0.0.20090529.py --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/testing/koffice/koffice-2.0.0.20090529.py 2009-12-04 23:36:51.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/testing/koffice/koffice-2.0.0.20090529.py 2009-12-08 23:40:17.000000000 +0000 @@ -17,6 +17,7 @@ self.patchToApply['2.0.82'] = ('koffice-2.0.82.diff', 0) self.patchToApply['2.0.83'] = ('koffice-2.0.83.diff', 1) self.patchToApply['2.0.91'] = ('koffice-2.0.91.diff', 1) + self.patchToApply['2.1.0'] = ('koffice-2.1.0.diff', 1) self.defaultTarget = 'svnHEAD' def setDependencies( self ): diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/testing/koffice/koffice-2.1.0.diff /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/testing/koffice/koffice-2.1.0.diff --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/testing/koffice/koffice-2.1.0.diff 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/testing/koffice/koffice-2.1.0.diff 2009-12-08 23:40:17.000000000 +0000 @@ -0,0 +1,16 @@ +diff -Nru koffice-2.1.0.orig/filters/karbon/CMakeLists.txt koffice-2.1.0/filters/karbon/CMakeLists.txt +--- koffice-2.1.0.orig/filters/karbon/CMakeLists.txt 2009-11-20 21:41:21.000000000 +0100 ++++ koffice-2.1.0/filters/karbon/CMakeLists.txt 2009-12-07 02:52:41.948375000 +0100 +@@ -32,9 +32,9 @@ + add_subdirectory( wmf ) + add_subdirectory( karbon1.x ) + add_subdirectory( eps ) +-if (POPPLER_FOUND) +- add_subdirectory( pdf ) +-endif (POPPLER_FOUND) ++#if (POPPLER_FOUND) ++# add_subdirectory( pdf ) ++#endif (POPPLER_FOUND) + + # enable again when these filters are ported + message(STATUS "Karbon: still need to port: applixgraphics, ai, kontour, xcf, xaml, xfig, msod and oodraw filters") diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/testing/skrooge/skrooge-0.01.py /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/testing/skrooge/skrooge-0.01.py --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/testing/skrooge/skrooge-0.01.py 2009-12-04 23:36:51.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/testing/skrooge/skrooge-0.01.py 2009-12-08 23:40:17.000000000 +0000 @@ -1,12 +1,5 @@ -import base -import utils -import os -import sys import info -PACKAGE_NAME = "skrooge" -PACKAGE_FULL_VER = "0.01" - class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['svnHEAD'] = 'trunk/extragear/office/skrooge' @@ -15,26 +8,15 @@ def setDependencies( self ): self.hardDependencies['libs/qt'] = 'default' self.hardDependencies['kdesupport/qca'] = 'default' + self.hardDependencies['kde/kdelibs'] = 'default' # missing: kdelibs -class subclass(base.baseclass): +from Package.CMakePackageBase import * + +class Package(CMakePackageBase): def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) self.subinfo = subinfo() - - def unpack( self ): - return self.kdeSvnUnpack() - - def compile( self ): - return self.kdeCompile() - - def install( self ): - return self.kdeInstall() - - def make_package( self ): - self.doPackaging( PACKAGE_NAME, PACKAGE_FULL_VER, True ) - - return True + CMakePackageBase.__init__(self) if __name__ == '__main__': - subclass().execute() + Package().execute() \ No newline at end of file diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/win32libs-sources/dbus-freedesktop-src/dbus-freedesktop-src-trunk.py /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/win32libs-sources/dbus-freedesktop-src/dbus-freedesktop-src-trunk.py --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/win32libs-sources/dbus-freedesktop-src/dbus-freedesktop-src-trunk.py 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/win32libs-sources/dbus-freedesktop-src/dbus-freedesktop-src-trunk.py 2009-12-08 23:40:17.000000000 +0000 @@ -0,0 +1,24 @@ +import info + +class subinfo(info.infoclass): + def setTargets( self ): + self.svnTargets['svnHEAD'] = 'git://anongit.freedesktop.org/git/dbus/dbus' + self.targetConfigurePath['svnHEAD'] = 'cmake' + self.defaultTarget = 'svnHEAD' + + def setDependencies( self ): + self.hardDependencies['win32libs-bin/expat'] = 'default' + self.hardDependencies['virtual/base'] = 'default' + +from Package.CMakePackageBase import * + +class Package(CMakePackageBase): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__(self) + self.subinfo.options.configure.defines = "-DDBUS_USE_EXPAT=ON -DDBUS_DISABLE_EXECUTABLE_DEBUG_POSTFIX=ON" + self.subinfo.options.make.slnBaseName = "dbus" + self.subinfo.options.package.packageName = 'dbus-freedesktop' + +if __name__ == '__main__': + Package().execute() diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/win32libs-sources/libssh-src/libssh-src-20090805.py /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/win32libs-sources/libssh-src/libssh-src-20090805.py --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/win32libs-sources/libssh-src/libssh-src-20090805.py 2009-12-04 23:36:50.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/win32libs-sources/libssh-src/libssh-src-20090805.py 2009-12-08 23:40:16.000000000 +0000 @@ -5,12 +5,16 @@ def setTargets( self ): self.svnTargets['gitHEAD'] = "git://git.libssh.org/projects/libssh/libssh.git" self.svnTargets['0.4'] = "git://git.libssh.org/projects/libssh/libssh.git|v0-4" + self.patchToApply['0.4'] = ('no-socklen_t-define.patch',1) self.defaultTarget = '0.4' self.options.package.withCompiler = False self.options.configure.defines = "-DWITH_STATIC_LIB=ON" def setDependencies( self ): self.hardDependencies['virtual/base'] = 'default' + # should be zlib-src, but it's not a real source package... + self.hardDependencies['win32libs-bin/zlib'] = 'default' + self.hardDependencies['win32libs-sources/openssl-src'] = 'default' from Package.CMakePackageBase import * diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/win32libs-sources/libssh-src/no-socklen_t-define.patch /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/win32libs-sources/libssh-src/no-socklen_t-define.patch --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/win32libs-sources/libssh-src/no-socklen_t-define.patch 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/win32libs-sources/libssh-src/no-socklen_t-define.patch 2009-12-08 23:40:16.000000000 +0000 @@ -0,0 +1,12 @@ +--- libssh-src/include/libssh/libssh.h Sat Dec 05 12:52:58 2009 ++++ libssh-src/include/libssh/libssh.h Sun Dec 06 22:12:39 2009 +@@ -63,9 +63,6 @@ + + #ifdef _WIN32 + #include +- #ifndef socklen_t +- #define socklen_t int +- #endif + #else /* _WIN32 */ + #include /* for fd_set * */ + #include diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/win32libs-sources/libssh-src/sys_time.patch /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/win32libs-sources/libssh-src/sys_time.patch --- kde-nightly-kdesupport-20091204+svn1058683/emerge/portage/win32libs-sources/libssh-src/sys_time.patch 2009-12-04 23:36:50.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/emerge/portage/win32libs-sources/libssh-src/sys_time.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ ---- libssh\pcap.c.orig 2009-11-16 21:42:21.579317400 +0100 -+++ libssh\pcap.c 2009-11-16 21:42:11.439081800 +0100 -@@ -26,10 +26,13 @@ - * \addtogroup ssh_pcap - * @{ */ - -+#include "config.h" -+ - #include -+#ifdef HAVE_SYS_TIME_H - #include -+#endif - --#include "config.h" - #include "libssh/libssh.h" - #include "libssh/pcap.h" - #include "libssh/session.h" diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/KDESupportNightly.cmake /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/KDESupportNightly.cmake --- kde-nightly-kdesupport-20091204+svn1058683/KDESupportNightly.cmake 2009-12-04 23:36:43.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/KDESupportNightly.cmake 2009-12-08 23:40:13.000000000 +0000 @@ -42,7 +42,7 @@ include("${CTEST_SOURCE_DIRECTORY}/CTestCustom.cmake" OPTIONAL) # if CMAKE_INSTALL_PREFIX was defined on the command line, put it in the initial cache, so cmake gets it -kde_ctest_write_initial_cache("${CTEST_BINARY_DIRECTORY}" CMAKE_INSTALL_PREFIX ) +kde_ctest_write_initial_cache("${CTEST_BINARY_DIRECTORY}" CMAKE_INSTALL_PREFIX) # configure, build, test, submit ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" ) diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/kdewin-installer/config.txt.cmake /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/kdewin-installer/config.txt.cmake --- kde-nightly-kdesupport-20091204+svn1058683/kdewin-installer/config.txt.cmake 2009-12-04 23:36:36.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/kdewin-installer/config.txt.cmake 2009-12-08 23:40:01.000000000 +0000 @@ -26,12 +26,12 @@ @categorypackages KDE amarok-vc90 digikam-vc90 kdelibs-vc90 kdepimlibs-vc90 kdepim-vc90 kdepim-runtime-vc90 kdebase-apps-vc90 kdebase-runtime-vc90 kdebase-workspace-vc90 kdeedu-vc90 kdegames-vc90 kdegraphics-vc90 kdenetwork-vc90 kdesdk-vc90 kdewebdev-vc90 kdeutils-vc90 kdeplasma-addons-vc90 kipi-plugins-vc90 krecipes-vc90 @categorypackages KDE amarok-mingw digikam-mingw kdelibs-mingw kdepimlibs-mingw kdepim-mingw kdepim-runtime-mingw kdebase-apps-mingw kdebase-runtime-mingw kdebase-workspace-mingw kdeedu-mingw kdegames-mingw kdegraphics-mingw kdenetwork-mingw kdesdk-mingw kdewebdev-mingw kdeutils-mingw kdeplasma-addons-mingw kipi-plugins-mingw krecipes-mingw @categorypackages KDE amarok-mingw4 digikam-mingw4 kdelibs-mingw4 kdepimlibs-mingw4 kdepim-mingw4 kdepim-runtime-mingw4 kdebase-apps-mingw4 kdebase-runtime-mingw4 kdebase-workspace-mingw4 kdeedu-mingw4 kdegames-mingw4 kdegraphics-mingw4 kdenetwork-mingw4 kdesdk-mingw4 kdewebdev-mingw4 kdeutils-mingw4 kdeplasma-addons-mingw4 kipi-plugins-mingw4 krecipes-mingw4 -@categorypackages KDE koffice-vc90 ktorrent-vc90 kile-vc90 kde-additional-vc90 kdevelop-vc90 kdevplatform-vc90 konversation-vc90 -@categorypackages KDE koffice-mingw ktorrent-mingw kile-mingw kde-additional-mingw kdevelop-mingw kdevplatform-mingw konversation-mingw -@categorypackages KDE koffice-mingw4 ktorrent-mingw4 kile-mingw4 kde-additional-mingw4 kdevelop-mingw4 kdevplatform-mingw4 konversation-mingw4 -@categorypackages KDEUNSTABLE k3b-vc90 yakuake-vc90 kaffeine-vc90 kmymoney-vc90 kphotoalbum-vc90 -@categorypackages KDEUNSTABLE k3b-mingw yakuake-mingw kaffeine-mingw kmymoney-mingw kphotoalbum-mingw -@categorypackages KDEUNSTABLE k3b-mingw4 yakuake-mingw4 kaffeine-mingw4 kmymoney-mingw4 kphotoalbum-mingw4 +@categorypackages KDE ktorrent-vc90 kile-vc90 kde-additional-vc90 kdevelop-vc90 kdevplatform-vc90 konversation-vc90 +@categorypackages KDE ktorrent-mingw kile-mingw kde-additional-mingw kdevelop-mingw kdevplatform-mingw konversation-mingw +@categorypackages KDE ktorrent-mingw4 kile-mingw4 kde-additional-mingw4 kdevelop-mingw4 kdevplatform-mingw4 konversation-mingw4 +@categorypackages KDEUNSTABLE koffice-vc90 k3b-vc90 yakuake-vc90 kaffeine-vc90 kmymoney-vc90 kphotoalbum-vc90 +@categorypackages KDEUNSTABLE koffice-mingw k3b-mingw yakuake-mingw kaffeine-mingw kmymoney-mingw kphotoalbum-mingw +@categorypackages KDEUNSTABLE koffice-mingw4 k3b-mingw4 yakuake-mingw4 kaffeine-mingw4 kmymoney-mingw4 kphotoalbum-mingw4 @categorypackages qt qt-vc90 qt-mingw qt-mingw4 qt-static-vc90 @categorypackages kde-l10n kde-l10n-af kde-l10n-ar kde-l10n-be kde-l10n-bg kde-l10n-bn kde-l10n-bn_IN kde-l10n-br kde-l10n-ca kde-l10n-cs kde-l10n-csb kde-l10n-cy kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB @categorypackages kde-l10n kde-l10n-eo kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-fy kde-l10n-ga kde-l10n-gl kde-l10n-gu kde-l10n-ha kde-l10n-he kde-l10n-hi kde-l10n-hne kde-l10n-hr kde-l10n-hsb Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/128x128/actions/continue-data-project.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/128x128/actions/continue-data-project.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/128x128/actions/tools-rip-video-cd.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/128x128/actions/tools-rip-video-cd.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/actions/document-export-table.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/actions/document-export-table.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/actions/document-open-data.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/actions/document-open-data.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/actions/tools-rip-audio-cd.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/actions/tools-rip-audio-cd.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/emblems/emblem-locked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/emblems/emblem-locked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/emblems/emblem-unlocked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/emblems/emblem-unlocked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/emblems/vcs-added.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/emblems/vcs-added.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/emblems/vcs-conflicting.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/emblems/vcs-conflicting.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/emblems/vcs-locally-modified.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/emblems/vcs-locally-modified.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/emblems/vcs-normal.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/emblems/vcs-normal.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/emblems/vcs-removed.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/emblems/vcs-removed.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/16x16/emblems/vcs-update-required.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/16x16/emblems/vcs-update-required.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/actions/document-export-table.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/actions/document-export-table.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/actions/tools-rip-audio-cd.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/actions/tools-rip-audio-cd.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/emblem-encrypted-locked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/emblem-encrypted-locked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/emblem-encrypted-unlocked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/emblem-encrypted-unlocked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/emblem-locked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/emblem-locked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/emblem-unlocked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/emblem-unlocked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/vcs-added.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/vcs-added.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/vcs-conflicting.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/vcs-conflicting.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/vcs-locally-modified.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/vcs-locally-modified.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/vcs-normal.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/vcs-normal.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/vcs-removed.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/vcs-removed.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/22x22/emblems/vcs-update-required.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/22x22/emblems/vcs-update-required.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/256x256/actions/continue-data-project.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/256x256/actions/continue-data-project.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/256x256/actions/tools-rip-video-cd.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/256x256/actions/tools-rip-video-cd.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/actions/document-export-table.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/actions/document-export-table.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/actions/tools-rip-audio-cd.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/actions/tools-rip-audio-cd.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/devices/media-optical-dvd-video.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/devices/media-optical-dvd-video.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/emblem-encrypted-locked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/emblem-encrypted-locked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/emblem-encrypted-unlocked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/emblem-encrypted-unlocked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/emblem-locked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/emblem-locked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/emblem-unlocked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/emblem-unlocked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/emblem-unmounted.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/emblem-unmounted.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/vcs-added.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/vcs-added.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/vcs-conflicting.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/vcs-conflicting.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/vcs-locally-modified.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/vcs-locally-modified.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/vcs-normal.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/vcs-normal.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/vcs-removed.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/vcs-removed.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/emblems/vcs-update-required.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/emblems/vcs-update-required.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/32x32/mimetypes/application-x-k3b.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/32x32/mimetypes/application-x-k3b.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/48x48/actions/document-export-table.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/48x48/actions/document-export-table.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/48x48/actions/tools-rip-audio-cd.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/48x48/actions/tools-rip-audio-cd.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/48x48/devices/media-optical-dvd-video.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/48x48/devices/media-optical-dvd-video.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/64x64/actions/continue-data-project.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/64x64/actions/continue-data-project.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/64x64/actions/tools-rip-video-cd.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/64x64/actions/tools-rip-video-cd.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/64x64/devices/media-optical-dvd-video.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/64x64/devices/media-optical-dvd-video.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/64x64/devices/media-optical-mixed-cd.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/64x64/devices/media-optical-mixed-cd.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/8x8/emblems/emblem-locked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/8x8/emblems/emblem-locked.png differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/8x8/emblems/emblem-unlocked.png and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/8x8/emblems/emblem-unlocked.png differ diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/AUTHORS /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/AUTHORS --- kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/AUTHORS 2009-12-04 23:36:31.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/AUTHORS 2009-12-08 23:39:58.000000000 +0000 @@ -1,9 +1,8 @@ Oxygen Icon Theme has been developed by The Oxygen Team. Art Directors: -David Vignoni Nuno F. Pinheiro -David J. Miller +David Vignoni Naming Coordinator Jakob Petsovits @@ -15,6 +14,7 @@ Kenneth Wimer Nuno F. Pinheiro Riccardo Iaconelli +David J. Miller Thanks to: Lee Olson: Contributed drawing used in application-x-bittorent icon. Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/document-open-remote.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/document-open-remote.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/hidef/continue-data-project.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/hidef/continue-data-project.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/hidef/tools-media-optical-copy.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/hidef/tools-media-optical-copy.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/hidef/tools-rip-audio-cd.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/hidef/tools-rip-audio-cd.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/hidef/tools-rip-video-cd.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/hidef/tools-rip-video-cd.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/small/16x16/document-export-table.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/small/16x16/document-export-table.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/small/16x16/tools-rip-audio-cd.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/small/16x16/tools-rip-audio-cd.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/small/22x22/document-export-table.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/small/22x22/document-export-table.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/small/22x22/tools-rip-audio-cd.svgz.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/small/22x22/tools-rip-audio-cd.svgz.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/small/32x32/document-export-table.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/small/32x32/document-export-table.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/small/32x32/tools-rip-audio-cd.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/small/32x32/tools-rip-audio-cd.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/small/48x48/document-export-table.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/small/48x48/document-export-table.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/small/48x48/tools-rip-audio-cd.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/small/48x48/tools-rip-audio-cd.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/tools-check-spelling.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/tools-check-spelling.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/tools-media-optical-burn-image.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/tools-media-optical-burn-image.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/tools-media-optical-burn.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/tools-media-optical-burn.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/tools-media-optical-copy.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/tools-media-optical-copy.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/tools-rip-audio-cd.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/tools-rip-audio-cd.svgz differ Binary files /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/tools-rip-video-cd.svgz and /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/tools-rip-video-cd.svgz differ diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/user-group-delete.svg /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/user-group-delete.svg --- kde-nightly-kdesupport-20091204+svn1058683/oxygen-icons/scalable/actions/user-group-delete.svg 2009-12-04 23:36:27.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/oxygen-icons/scalable/actions/user-group-delete.svg 2009-12-08 23:39:55.000000000 +0000 @@ -1,7 +1,7 @@ + - - - - - - - - - - - - - + id="linearGradient3207"> + id="stop3209" /> + id="stop3211" /> + id="linearGradient3149"> + id="stop3151" /> - - - - + id="stop3153" /> + + + + + + + + + - + - + + + + + + - - - - - - - - - - - - - + id="linearGradient5331" + xlink:href="#linearGradient5064" + inkscape:collect="always" /> + id="linearGradient5329" + xlink:href="#linearGradient5303" + inkscape:collect="always" /> + + + + id="filter5319" + inkscape:collect="always"> + id="feGaussianBlur5321" + stdDeviation="0.33178534" + inkscape:collect="always" /> + - + id="clipPath5269" + clipPathUnits="userSpaceOnUse"> + - - - - - - - - - - - - - + y2="102.05355" + x2="64.390625" + y1="166.45607" + x1="64.390625" + id="linearGradient5234" + xlink:href="#linearGradient6562" + inkscape:collect="always" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient5177" + xlink:href="#linearGradient4533" + inkscape:collect="always" /> - - - - - - + - + + y2="77.5271" + x2="79.504295" + y1="111.30219" + x1="76.088844" + id="linearGradient5159" + xlink:href="#linearGradient5064" + inkscape:collect="always" /> - + + + + + + + + y2="119.7105" + x2="96.308182" + y1="61.748241" + x1="83.047356" + id="linearGradient5086" + xlink:href="#linearGradient4891" + inkscape:collect="always" /> + id="linearGradient5076" + xlink:href="#linearGradient4533" + inkscape:collect="always" /> + y2="19.991558" + x2="69.568176" + y1="19.991558" + x1="42.952232" + id="linearGradient5062" + xlink:href="#linearGradient5064" + inkscape:collect="always" /> + + + + id="radialGradient5032" + xlink:href="#linearGradient4995" + inkscape:collect="always" /> + + + - + y2="-3.1925783" + x2="154.28894" + y1="92.819771" + x1="141.36299" + id="linearGradient5016" + xlink:href="#linearGradient5018" + inkscape:collect="always" /> - - - + id="radialGradient4993" + xlink:href="#linearGradient9222" + inkscape:collect="always" /> + id="radialGradient4991" + xlink:href="#linearGradient3149" + inkscape:collect="always" /> + + + + + + - + id="linearGradient4957" + xlink:href="#linearGradient4891" + inkscape:collect="always" /> + + + + + + + y2="15.548439" + x2="65.525932" + y1="22.207571" + x1="50.665627" + id="linearGradient4897" + xlink:href="#linearGradient4891" + inkscape:collect="always" /> + + + + + + - + y2="114.37083" + x2="74.290184" + y1="133.31853" + x1="51.914593" + id="linearGradient4774" + xlink:href="#linearGradient4768" + inkscape:collect="always" /> - - - - - + + + + + + + + + + + + - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + id="radialGradient3611" + xlink:href="#linearGradient3837" + inkscape:collect="always" /> + id="linearGradient3346" + inkscape:collect="always" + gradientTransform="scale(0.964324,1.036996)" + x1="50.971487" + y1="72.623548" + x2="85.53623" + y2="72.623548" + gradientUnits="userSpaceOnUse"> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> - + id="linearGradient6562"> + style="stop-color:#8e8e8e;stop-opacity:1;" /> + style="stop-color:#f8f8f8;stop-opacity:1;" /> - + inkscape:collect="always" + id="linearGradient3575"> + id="stop3577" /> + id="stop3579" /> - + inkscape:collect="always" + id="linearGradient3366"> + id="stop3368" /> + id="stop4472" /> - + id="linearGradient5826"> + id="stop5828" /> + id="stop5830" /> - + id="linearGradient5433"> + style="stop-color:#ff0000;stop-opacity:1;" /> + style="stop-color:#7f0000;stop-opacity:1;" /> + + + + gradientTransform="translate(-96.166522,0)" + x1="58.743717" + y1="78.411346" + x2="58.743717" + y2="-15.688621" /> + id="linearGradient3733"> + style="stop-color:#e2e2e2;stop-opacity:1;" + id="stop3735" + offset="0" /> + style="stop-color:#ffffff;stop-opacity:1;" + id="stop3737" + offset="1" /> - - + id="linearGradient3215"> + style="stop-color:#671800;stop-opacity:1;" + id="stop3217" + offset="0" /> + style="stop-color:#7b3900;stop-opacity:0;" + id="stop4157" + offset="1" /> - - - + id="linearGradient3163"> - - - + style="stop-color:#fff5e4;stop-opacity:1;" + id="stop3165" + offset="0" /> + style="stop-color:#ffecd0;stop-opacity:1;" + id="stop3173" + offset="0.25" /> + style="stop-color:#ffd390;stop-opacity:1;" + id="stop3171" + offset="0.5" /> + style="stop-color:#ffc46a;stop-opacity:1;" + id="stop3167" + offset="1" /> - + x2="339.51855" + gradientTransform="translate(-95.225391,0)" + y1="457.90872" + x1="338.62283" + id="linearGradient3279" + inkscape:collect="always" /> + + + + + + + id="linearGradient4067" + inkscape:collect="always"> + style="stop-color:#8d97b7;stop-opacity:1;" /> + style="stop-color:#8d97b7;stop-opacity:0;" /> + + + - + id="linearGradient3397"> + style="stop-color:#f4f5f8;stop-opacity:1;" /> + style="stop-color:#fdfdfe;stop-opacity:1;" /> - + id="linearGradient3433" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + + + - + id="linearGradient3837" + inkscape:collect="always"> + style="stop-color:#f1e4d4;stop-opacity:1;" /> + style="stop-color:#f1e4d4;stop-opacity:0;" /> - + + + + + + + id="radialGradient3291" + xlink:href="#linearGradient3279" + inkscape:collect="always" /> + id="linearGradient4064"> - - - - + style="stop-color:#faf0e5;stop-opacity:1;" /> + style="stop-color:#f7e7d6;stop-opacity:1;" + offset="0.591133" + id="stop3378" /> + style="stop-color:#efcfac;stop-opacity:1;" /> + + + - + id="linearGradient3654"> - - - - + style="stop-color:#f9ede0;stop-opacity:1;" /> + style="stop-color:#f9ede0;stop-opacity:0.80575538;" + offset="0.5" + id="stop3670" /> + style="stop-color:#f9ede0;stop-opacity:0;" /> - + id="linearGradient4245" + inkscape:collect="always"> + style="stop-color:#ecc69f;stop-opacity:1" /> + style="stop-color:#efd1b1;stop-opacity:1" /> - + id="linearGradient4253" + inkscape:collect="always"> + style="stop-color:#f2d8bb;stop-opacity:1;" /> + style="stop-color:#f2d8bb;stop-opacity:0;" /> - + id="linearGradient4291"> + style="stop-color:#e7b684;stop-opacity:1" /> + style="stop-color:#e68e61;stop-opacity:0;" /> - + id="linearGradient4365" + inkscape:collect="always"> + style="stop-color:#e5ae77;stop-opacity:1" /> + style="stop-color:#e7b684;stop-opacity:0;" /> - + id="linearGradient4533"> + style="stop-color:#ffffff;stop-opacity:0.15272728;" /> + style="stop-color:#ffffff;stop-opacity:1;" /> - + id="linearGradient4556" + inkscape:collect="always"> + style="stop-color:#f7e8d7;stop-opacity:1;" /> + style="stop-color:#f7e8d7;stop-opacity:0;" /> - + id="linearGradient4610" + inkscape:collect="always"> + style="stop-color:#f7e8d7;stop-opacity:1;" /> + style="stop-color:#f7e8d7;stop-opacity:0;" /> - + id="linearGradient4652" + inkscape:collect="always"> + style="stop-color:#f7e8d7;stop-opacity:1;" /> + style="stop-color:#f7e8d7;stop-opacity:0;" /> - + id="linearGradient4768" + inkscape:collect="always"> + style="stop-color:#c39a7c;stop-opacity:1;" /> + style="stop-color:#c39a7c;stop-opacity:0;" /> - + id="linearGradient4891"> + style="stop-color:#473a0f;stop-opacity:1;" /> + style="stop-color:#743500;stop-opacity:1;" + offset="0.5" + id="stop4899" /> + style="stop-color:#4d3117;stop-opacity:1;" /> - + id="linearGradient4995"> - - - - + id="stop4997" /> + id="stop5000" + offset="0.40000001" + style="stop-color:#f7e7d6;stop-opacity:1;" /> + id="stop5002" /> - + id="linearGradient5018"> + id="stop5020" /> + id="stop5022" /> - + id="linearGradient5064"> - + style="stop-color:#000000;stop-opacity:0;" /> + style="stop-color:#000000;stop-opacity:0.67636365;" + offset="0.5" + id="stop5072" /> + style="stop-color:#000000;stop-opacity:0;" /> - + id="linearGradient5240"> + id="stop5242" /> + id="stop5244" /> - + id="linearGradient5303" + inkscape:collect="always"> + style="stop-color:#aaaaaa;stop-opacity:1;" /> + style="stop-color:#aaaaaa;stop-opacity:0;" /> - + id="linearGradient5576" + inkscape:collect="always"> + style="stop-color:#643308;stop-opacity:1;" /> + style="stop-color:#aaaaaa;stop-opacity:0" /> + + + - + id="linearGradient3578" + inkscape:collect="always"> + style="stop-color:#c8cddc;stop-opacity:1;" /> + style="stop-color:#c8cddc;stop-opacity:0;" /> - + id="linearGradient3586" + inkscape:collect="always"> + style="stop-color:#000000;stop-opacity:1;" /> + style="stop-color:#000000;stop-opacity:0;" /> + + + + id="linearGradient3508" + inkscape:collect="always"> + style="stop-color:#c8cddc;stop-opacity:1;" /> + style="stop-color:#c8cddc;stop-opacity:0;" /> + + + + id="linearGradient3343" + inkscape:collect="always"> + style="stop-color:#bbc1d4;stop-opacity:1;" /> + style="stop-color:#bbc1d4;stop-opacity:0;" /> + + + + id="linearGradient4126" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + + + + + + + id="linearGradient3516" + inkscape:collect="always"> + style="stop-color:#c8cddc;stop-opacity:1;" /> + style="stop-color:#c8cddc;stop-opacity:0;" /> + + + + id="linearGradient3581" + inkscape:collect="always"> + style="stop-color:#dfcbba;stop-opacity:1;" /> + style="stop-color:#dfcbba;stop-opacity:0;" /> + + + + id="linearGradient3499" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:1;" /> + style="stop-color:#ffffff;stop-opacity:0;" /> + + + + id="linearGradient3489" + inkscape:collect="always"> + style="stop-color:#765c44;stop-opacity:1;" /> + style="stop-color:#765c44;stop-opacity:0;" /> + + + + id="linearGradient3368" + inkscape:collect="always"> + style="stop-color:#e5d3c3;stop-opacity:1;" /> + style="stop-color:#e5d3c3;stop-opacity:0;" /> + + + + id="linearGradient3329" + inkscape:collect="always"> - - + style="stop-color:#f9eee2;stop-opacity:1;" /> + style="stop-color:#f9eee2;stop-opacity:0;" /> - - - + + + + + + + + + + + + + + + + + + gradientTransform="translate(-372.5,-324.5)" + x1="353.44516" + y1="390.86218" + x2="339.76785" + y2="373.61218" /> - - - + gradientTransform="matrix(0.5366445,0,0,1.8634309,-372.5,-324.5)" + x1="563.64667" + y1="214.96599" + x2="568.9887" + y2="214.96599" /> + gradientTransform="matrix(1.0059645,0,0,1.0053055,-271.66684,-360.28069)" + x1="325.29688" + y1="481.87405" + x2="325.29688" + y2="426.80276" /> + gradientTransform="translate(-372.5,-324.5)" + x1="283.50647" + y1="463.03894" + x2="312.78384" + y2="443.03894" /> - - - - + gradientTransform="translate(-372.5,-324.5)" + x1="326" + y1="476.40894" + x2="310.53195" + y2="429.73987" /> - - - + gradientTransform="translate(-372.5,-324.5)" + x1="315.72318" + y1="453.0892" + x2="290.62091" + y2="434.35086" /> + gradientTransform="translate(58.5,26.5)" + x1="315.72318" + y1="453.0892" + x2="290.62091" + y2="434.35086" /> + x1="270.50647" + y1="482.53894" + x2="299.28384" + y2="441.53894" /> - - - - - - - - - - - - + - - - - - - - - - + gradientTransform="translate(-372.5,-324.5)" + x1="313.74829" + y1="444.45746" + x2="305.67725" + y2="463.13513" /> - - - - - - - - - - - - - - - - - - + gradientTransform="matrix(1.0059645,0,0,1.4472234,-271.44676,-535.35257)" + cx="324.39758" + cy="396.09259" + fx="330.04404" + fy="392.75388" + r="22.444885" /> - - - - - - - - - - - - - - - - - - - + x1="412.78592" + y1="400.84558" + x2="412.78592" + y2="422.63611" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + x1="324.65039" + y1="398.85446" + x2="325.7691" + y2="370.57019" /> + + inkscape:collect="always" + id="filter9154" + x="-0.019777197" + width="1.0395544" + y="-0.17240331" + height="1.3448066"> + inkscape:collect="always" + stdDeviation="0.85752689" + id="feGaussianBlur9156" /> + + + + + + - + xlink:href="#linearGradient4179" + id="linearGradient3320" + y2="20.362558" + x2="56.770992" + y1="71.824867" + x1="57.654171" /> - - - - - - - - - - - + xlink:href="#linearGradient3366" + id="linearGradient3318" + y2="70.357269" + x2="47.264141" + y1="21.738457" + x1="47.264141" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient3397" + id="linearGradient3316" + y2="32.750854" + x2="51.544849" + y1="109.97649" + x1="68.313011" /> - + xlink:href="#linearGradient3163" + id="linearGradient3314" + y2="55.07938" + x2="57.434441" + y1="92.973083" + x1="59.999996" /> - - - + + xlink:href="#linearGradient3207" + id="linearGradient3310" + y2="13.510336" + x2="34.875107" + y1="13.510336" + x1="31.90625" /> + xlink:href="#linearGradient3366" + id="linearGradient3304" + y2="13.510336" + x2="34.875107" + y1="13.510336" + x1="31.90625" /> + xlink:href="#linearGradient5433" + id="linearGradient3301" + y2="36.655769" + x2="55.007042" + y1="88.460976" + x1="55.007042" /> - - - - - - - + xlink:href="#linearGradient3489" + id="linearGradient3298" + y2="384.62384" + x2="345.62039" + y1="385.86127" + x1="304.88663" /> - - - + gradientTransform="scale(1.0975951,0.9110828)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3489" + id="linearGradient3296" + y2="14.856744" + x2="31.500689" + y1="14.856744" + x1="26.091133" /> - - - + xlink:href="#linearGradient3499" + id="linearGradient3294" + y2="14.856744" + x2="31.500689" + y1="14.856744" + x1="26.091133" /> - - - + xlink:href="#linearGradient5826" + id="linearGradient3292" + y2="-15.688621" + x2="58.743717" + y1="78.411346" + x1="58.743717" /> + + + + + + + + + + id="linearGradient4179"> + style="stop-color:#ffffff;stop-opacity:0" /> + style="stop-color:#ffffff;stop-opacity:1" /> - - + inkscape:window-y="23" + inkscape:window-maximized="0"> #include #include "error.h" +#ifdef Q_OS_WIN +#include +#endif #include namespace Soprano { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/odbcenvironment.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/odbcenvironment.h --- kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/odbcenvironment.h 2009-12-04 23:36:42.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/odbcenvironment.h 2009-12-08 23:40:11.000000000 +0000 @@ -23,7 +23,9 @@ #define _SOPRANO_ODBC_ENVIRONMENT_H_ #include "error.h" - +#ifdef Q_OS_WIN +#include +#endif #include namespace Soprano { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/odbcqueryresult.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/odbcqueryresult.h --- kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/odbcqueryresult.h 2009-12-04 23:36:42.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/odbcqueryresult.h 2009-12-08 23:40:11.000000000 +0000 @@ -22,7 +22,11 @@ #ifndef _SOPRANO_ODBC_QUERY_RESULT_H_ #define _SOPRANO_ODBC_QUERY_RESULT_H_ +#include #include "error.h" +#ifdef Q_OS_WIN +#include +#endif #include namespace Soprano { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/virtuosobackend.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/virtuosobackend.cpp --- kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/virtuosobackend.cpp 2009-12-04 23:36:42.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/virtuosobackend.cpp 2009-12-08 23:40:11.000000000 +0000 @@ -86,9 +86,13 @@ return 0; } +#ifdef Q_OS_WIN + QString connectString = QString( "driver={Virtuoso (Open Source)};host=%1:%2;uid=%3;pwd=%4" ) + .arg( host, QString::number( port ), uid, pwd ); +#else QString connectString = QString( "host=%1:%2;uid=%3;pwd=%4;driver=%5" ) .arg( host, QString::number( port ), uid, pwd, driverPath ); - +#endif ODBC::ConnectionPool* connectionPool = new ODBC::ConnectionPool( connectString ); // FIXME: should configuration only be allowed on spawned servers? @@ -129,7 +133,7 @@ QDir dir( path ); foreach( const QString& suffix, suffixes ) { QString file = prefix + suffix; - if ( QFile::exists( file ) && + if ( dir.exists( file ) && !dir.remove( file ) ) { setError( "Failed to remove file '" + dir.filePath( file ), Error::ErrorUnknown ); return false; @@ -201,7 +205,17 @@ QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const { +#ifdef Q_OS_WIN + QStringList virtuosoDirs; + const QString virtuosoHome = qgetenv("VIRTUOSO_HOME"); + if ( !virtuosoHome.isEmpty() ) { + virtuosoDirs << (virtuosoHome + QDir::separator() + QLatin1String("bin")) + << (virtuosoHome + QDir::separator() + QLatin1String("lib")); + } + return Soprano::findLibraryPath( "virtodbc", virtuosoDirs ); +#else return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) ); +#endif } #include "virtuosobackend.moc" diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/virtuosocontroller.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/virtuosocontroller.cpp --- kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/virtuosocontroller.cpp 2009-12-04 23:36:42.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/virtuosocontroller.cpp 2009-12-08 23:40:11.000000000 +0000 @@ -30,11 +30,17 @@ #include #include #include -#include +#include +#include Q_DECLARE_METATYPE( QProcess::ExitStatus ) namespace { + +#ifdef Q_OS_WIN + QMutex portNumberMutex; +#endif + quint16 getFreePortNumber() { // QTcpServer server; // if ( server.listen() ) { @@ -44,11 +50,17 @@ // qDebug() << "Failed to determine free port. Falling back to default 1111."; // return 1111; // } +#ifdef Q_OS_WIN + static quint16 p = 1111; + QMutexLocker l(&portNumberMutex); + return p++; +#else int p = 1111; while ( QFile::exists( QString( "/tmp/virt_%1" ).arg( p ) ) ) { ++p; } return p; +#endif } } @@ -59,6 +71,8 @@ m_lastExitStatus( NormalExit ), m_initializationLoop( 0 ) { + setObjectName("virtuoso_controller"); + connect( &m_virtuosoProcess, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(slotProcessFinished(int,QProcess::ExitStatus)) ); connect( &m_virtuosoProcess, SIGNAL(readyReadStandardError()), @@ -71,14 +85,15 @@ Soprano::VirtuosoController::~VirtuosoController() { - shutdown(); + if ( isRunning() ) + shutdown(); } bool Soprano::VirtuosoController::start( const BackendSettings& settings, RunFlags flags ) { if ( !isRunning() ) { - QTemporaryFile tmpFile( QDir::tempPath() + "/virtuoso_XXXXXX.ini" ); + QTemporaryFile tmpFile( QDir::toNativeSeparators( QDir::tempPath() ) + QDir::separator() + "virtuoso_XXXXXX.ini" ); tmpFile.setAutoRemove( false ); tmpFile.open(); m_configFilePath = tmpFile.fileName(); @@ -97,14 +112,19 @@ // remove old lock files to be sure QString lockFilePath = valueInSettings( settings, BackendOptionStorageDir ).toString() - + QLatin1String( "/soprano-virtuoso.lck" ); + + QDir::separator() + QLatin1String( "soprano-virtuoso.lck" ); if ( QFile::exists( lockFilePath ) ) QFile::remove( lockFilePath ); QStringList args; +#ifdef Q_OS_WIN + args << "+foreground" + << "+configfile" << m_configFilePath; +#else args << "+foreground" << "+config" << m_configFilePath << "+wait"; +#endif qDebug() << "Starting Virtuoso server:" << virtuosoExe << args; m_virtuosoProcess.start( virtuosoExe, args, QIODevice::ReadOnly ); @@ -149,7 +169,7 @@ // we only wait for the server to tell us that it is ready while ( m_virtuosoProcess.canReadLine() ) { QString line = QString::fromLatin1( m_virtuosoProcess.readLine() ); - qDebug() << line; + //qDebug() << line; if ( line.contains( "Server online at" ) ) { m_virtuosoProcess.closeReadChannel( QProcess::StandardError ); m_status = Running; @@ -169,6 +189,7 @@ { if ( m_virtuosoProcess.state() == QProcess::Running ) { qDebug() << "Shutting down virtuoso instance" << m_virtuosoProcess.pid(); +#ifndef Q_OS_WIN m_status = ShuttingDown; m_virtuosoProcess.terminate(); if ( !m_virtuosoProcess.waitForFinished( 30*1000 ) ) { @@ -183,6 +204,13 @@ clearError(); return true; } +#else + m_status = Killing; + m_virtuosoProcess.kill(); + m_virtuosoProcess.waitForFinished(); + clearError(); + return true; +#endif } else { setError( "Virtuoso not running. Cannot shutdown." ); @@ -210,7 +238,7 @@ m_lastExitStatus = CrashExit; else if ( m_status == Killing ) m_lastExitStatus = ForcedExit; - else if ( !m_status != ShuttingDown ) + else if ( m_status != ShuttingDown ) m_lastExitStatus = ThirdPartyExit; m_status = NotRunning; @@ -230,7 +258,7 @@ qDebug() << Q_FUNC_INFO << path; // storage dir - QString dir = valueInSettings( settings, BackendOptionStorageDir ).toString(); + QString dir = QDir::toNativeSeparators( valueInSettings( settings, BackendOptionStorageDir ).toString() ); // backwards compatibility int numberOfBuffers = valueInSettings( settings, "buffers", 2000 ).toInt(); @@ -245,8 +273,8 @@ // the unix socket name. m_port = getFreePortNumber(); - if ( !dir.endsWith( '/' ) ) - dir += '/'; + if ( !dir.endsWith( QDir::separator() ) ) + dir += QDir::separator(); QSettings cfs( path, QSettings::IniFormat ); @@ -266,8 +294,13 @@ cfs.beginGroup( "Parameters" ); cfs.setValue( "LiteMode", "1" ); cfs.setValue( "ServerPort", QString::number( m_port ) ); +#ifdef Q_OS_WIN + cfs.setValue( "DisableUnixSocket", "1" ); + cfs.setValue( "DisableTcpSocket", "0" ); +#else cfs.setValue( "DisableTcpSocket", "1" ); - +#endif + // FIXME: what is this? // cfs.setValue( "DirsAllowed", "." ); @@ -303,8 +336,19 @@ // static QString Soprano::VirtuosoController::locateVirtuosoBinary() { - foreach( const QString& dir, Soprano::exeDirs() ) { - QFileInfo info( dir + "/virtuoso-t" ); + QStringList dirs = Soprano::exeDirs(); +#ifdef Q_OS_WIN + const QString virtuosoHome = qgetenv("VIRTUOSO_HOME"); + if ( !virtuosoHome.isEmpty() ) + dirs << (virtuosoHome + QDir::separator() + QLatin1String("bin")); +#endif + + foreach( const QString& dir, dirs ) { +#ifdef Q_OS_WIN + QFileInfo info( dir + QDir::separator() + QLatin1String("virtuoso-t.exe") ); +#else + QFileInfo info( dir + QLatin1String("/virtuoso-t") ); +#endif if ( info.isExecutable() && !info.isSymLink() ) { return info.absoluteFilePath(); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/virtuosocontroller.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/virtuosocontroller.h --- kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/virtuosocontroller.h 2009-12-04 23:36:42.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/virtuosocontroller.h 2009-12-08 23:40:11.000000000 +0000 @@ -61,7 +61,7 @@ Q_DECLARE_FLAGS( RunFlags, RunFlag ) bool start( const BackendSettings& settings, RunFlags = NoFlags ); - bool shutdown(); + Q_INVOKABLE bool shutdown(); int usedPort() const; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/virtuosotools.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/virtuosotools.h --- kde-nightly-kdesupport-20091204+svn1058683/soprano/backends/virtuoso/virtuosotools.h 2009-12-04 23:36:42.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/backends/virtuoso/virtuosotools.h 2009-12-08 23:40:11.000000000 +0000 @@ -22,6 +22,10 @@ #ifndef _SOPRANO_IODBC_TOOLS_H_ #define _SOPRANO_IODBC_TOOLS_H_ +#include +#ifdef Q_OS_WIN +#include +#endif #include #include diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/CMakeLists.txt /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/CMakeLists.txt --- kde-nightly-kdesupport-20091204+svn1058683/soprano/CMakeLists.txt 2009-12-04 23:36:41.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/CMakeLists.txt 2009-12-08 23:40:10.000000000 +0000 @@ -105,9 +105,9 @@ if(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND) set(BUILD_DBUS_SUPPORT TRUE) endif(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND) -if(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND AND IODBC_FOUND AND NOT WIN32) +if(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND AND IODBC_FOUND OR WIN32) set(BUILD_VIRTUOSO_BACKEND TRUE) -endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND AND IODBC_FOUND AND NOT WIN32) +endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND AND IODBC_FOUND OR WIN32) set(HAVE_DBUS BUILD_DBUS_SUPPORT) ################## setup install directories ################################ diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/server/serverconnection.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/server/serverconnection.cpp --- kde-nightly-kdesupport-20091204+svn1058683/soprano/server/serverconnection.cpp 2009-12-04 23:36:42.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/server/serverconnection.cpp 2009-12-08 23:40:11.000000000 +0000 @@ -57,6 +57,8 @@ ModelPool* modelPool; QIODevice* socket; + quint16 currentCommand; + QHash openStatementIterators; QHash openNodeIterators; QHash openQueryIterators; @@ -110,6 +112,7 @@ d->core = core; d->modelPool = pool; d->socket = 0; + d->currentCommand = 0; } @@ -177,9 +180,13 @@ void Soprano::Server::ServerConnection::Private::_s_readNextCommand() { + if ( currentCommand != 0 ) + return; + DataStream stream( socket ); quint16 command = 0; stream.readUnsignedInt16( command ); + currentCommand = command; switch( command ) { case COMMAND_SUPPORTS_PROTOCOL_VERSION: supportsProtocolVersion(); @@ -276,6 +283,8 @@ q->close(); break; } + + currentCommand = 0; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/soprano/test/virtuosobackendtest.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/soprano/test/virtuosobackendtest.cpp --- kde-nightly-kdesupport-20091204+svn1058683/soprano/test/virtuosobackendtest.cpp 2009-12-04 23:36:40.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/soprano/test/virtuosobackendtest.cpp 2009-12-08 23:40:09.000000000 +0000 @@ -37,12 +37,17 @@ if ( b ) { BackendSettings settings; QString dirName( "soprano_virtuoso_backend_test_model_" ); - QDir tmpDir( "/tmp" ); +#ifdef Q_OS_WIN + QString tmp = qgetenv("TEMP"); +#else + QString tmp = "/tmp"; +#endif + QDir tmpDir( tmp ); while ( tmpDir.exists( dirName + QString::number( m_modelCnt ) ) ) ++m_modelCnt; dirName += QString::number( m_modelCnt ); tmpDir.mkdir( dirName ); - settings << BackendSetting( BackendOptionStorageDir, "/tmp/" + dirName ); + settings << BackendSetting( BackendOptionStorageDir, tmp + QDir::separator() + dirName ); // settings << BackendSetting( BackendOptionHost, "localhost" ); // settings << BackendSetting( BackendOptionPort, 1111 ); // settings << BackendSetting( BackendOptionUsername, "dba" ); @@ -59,9 +64,26 @@ { const Soprano::Backend* b = Soprano::discoverBackendByName( "virtuosobackend" ); if ( b ) { + +#ifdef Q_OS_WIN + // We need to shut down the server before we can remove the test files + // However we don't have access to the controller, so use reflection to trigger the shutdown + // It's quite ugly I know, but it's ok for the unit tests imho + QObject* controller = m->findChild( "virtuoso_controller" ); + if ( controller ) { + QMetaObject::invokeMethod( controller, "shutdown" ); + } +#endif + b->deleteModelData( m_settingsHash[m] ); - QDir tmpDir( "/tmp" ); - tmpDir.rmdir( settingInSettings( m_settingsHash[m], BackendOptionStorageDir ).value().toString().section( "/", -1 ) ); + +#ifdef Q_OS_WIN + QString tmp = qgetenv("TEMP"); +#else + QString tmp = "/tmp"; +#endif + QDir tmpDir( tmp ); + tmpDir.rmdir( settingInSettings( m_settingsHash[m], BackendOptionStorageDir ).value().toString().section( QDir::separator(), -1 ) ); m_settingsHash.remove( m ); } delete m; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/asyncsocketclient.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/asyncsocketclient.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/asyncsocketclient.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/asyncsocketclient.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -103,7 +103,7 @@ h.uri = response[i++]; h.fragment = response[i++]; h.mimetype = response[i++]; - h.score = atof(response[i++].c_str()); + h.score = (float)atof(response[i++].c_str()); h.size = atoi(response[i++].c_str()); h.mtime = atoi(response[i++].c_str()); while (i < response.size()) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/asyncsocket.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/asyncsocket.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/asyncsocket.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/asyncsocket.cpp 2009-12-08 23:40:31.000000000 +0000 @@ -58,7 +58,7 @@ // set the address memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - uint len = socketpath.length(); + size_t len = socketpath.length(); len = (len > sizeof(serv_addr.sun_path)) ?sizeof(serv_addr.sun_path) :len; strncpy(serv_addr.sun_path, socketpath.c_str(), len); serv_addr.sun_path[len] = '\0'; @@ -111,7 +111,7 @@ ssize_t r = send(socket, request.c_str()+writepos, request.length()-writepos, SOCKET_NOSIGNAL); if (r != -1) { - writepos += r; + writepos += (unsigned)r; if (writepos == request.length()) { status = Reading; } @@ -130,7 +130,7 @@ AsyncSocket::read() { char c; while (true) { - int r = recv(socket, &c, 1, MSG_DONTWAIT|SOCKET_NOSIGNAL); + ssize_t r = recv(socket, &c, 1, MSG_DONTWAIT|SOCKET_NOSIGNAL); switch (r) { case 0: close(); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/dbus/dbuscpp/dbushandler.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/dbus/dbuscpp/dbushandler.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/dbus/dbuscpp/dbushandler.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/dbus/dbuscpp/dbushandler.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -28,6 +28,7 @@ #include #include #include +#include #include @@ -36,7 +37,11 @@ DBusHandler::DBusHandler() { DBusError err; - pipe(quitpipe); + if (pipe(quitpipe) == -1) { + fprintf(stderr, "Connection Error (%s)\n", strerror(errno)); + conn = 0; + return; + } // initialise the error dbus_error_init(&err); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/dbus/dbusserialization.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/dbus/dbusserialization.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/dbus/dbusserialization.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/dbus/dbusserialization.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -48,7 +48,8 @@ // the fragments as stored are sometimes not properly recoded back // from usc2 to utf8 which causes dbus to close the connection, // whereupon the strigidaemon quits - if (Strigi::checkUtf8(i->fragment.c_str(), i->fragment.size())) { + if (Strigi::checkUtf8(i->fragment.c_str(), + (uint32_t)i->fragment.size())) { c = i->fragment.c_str(); } else { c = ""; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/dbus/dbustest.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/dbus/dbustest.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/dbus/dbustest.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/dbus/dbustest.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -38,7 +38,10 @@ int ret; printf("Listening for method calls\n"); - pipe(quitpipe); + if (pipe(quitpipe) == -1) { + fprintf(stderr, "Could not create pipe.\n"); + return 0; + } // initialise the error dbus_error_init(&err); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/eventlistener/eventlistenerqueue.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/eventlistener/eventlistenerqueue.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/eventlistener/eventlistenerqueue.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/eventlistener/eventlistenerqueue.cpp 2009-12-08 23:40:31.000000000 +0000 @@ -111,21 +111,21 @@ snprintf (buff, 50*sizeof(char), "%lu", (unsigned long)m_processed.size()); STRIGI_LOG_DEBUG ("strigi.EventListenerQueue.run", string(buff) + " events in \"processed\" queue"); - m_processedOldCount = m_processed.size(); + m_processedOldCount = (unsigned int)m_processed.size(); } if (m_toProcess.size() != m_toProcessOldCount) { snprintf (buff, 50*sizeof(char), "%lu", (unsigned long)m_toProcess.size()); STRIGI_LOG_DEBUG ("strigi.EventListenerQueue.run", string(buff) + " events in \"to process\" queue"); - m_toProcessOldCount = m_toProcess.size(); + m_toProcessOldCount = (unsigned int)m_toProcess.size(); } if (m_waiting.size() != m_waitingOldCount) { snprintf (buff, 50*sizeof(char), "%lu", (unsigned long)m_waiting.size()); STRIGI_LOG_DEBUG ("strigi.EventListenerQueue.run", string(buff) + " events in \"waiting\" queue"); - m_waitingOldCount = m_waiting.size(); + m_waitingOldCount = (unsigned int)m_waiting.size(); } STRIGI_MUTEX_UNLOCK (&m_mutex); @@ -449,7 +449,7 @@ if (STRIGI_MUTEX_TRY_LOCK (&m_mutex) == 0) { - i = m_toProcess.size(); + i = (unsigned int)m_toProcess.size(); STRIGI_MUTEX_UNLOCK (&m_mutex); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/interface.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/interface.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/interface.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/interface.cpp 2009-12-08 23:40:31.000000000 +0000 @@ -137,7 +137,7 @@ writer->deleteEntries(paths); AnalyzerConfiguration ic; StreamAnalyzer streamindexer(ic); - StringInputStream sr(&content[0], content.size(), false); + StringInputStream sr(&content[0], (int32_t)content.size(), false); AnalysisResult idx(path, mtime, *writer, streamindexer); idx.index(&sr); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/socketclient.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/socketclient.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/socketclient.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/socketclient.cpp 2009-12-08 23:40:31.000000000 +0000 @@ -60,7 +60,7 @@ // set the address memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - uint len = socketpath.length(); + size_t len = socketpath.length(); len = (len > sizeof(serv_addr.sun_path)) ?sizeof(serv_addr.sun_path) :len; strncpy(serv_addr.sun_path, socketpath.c_str(), len); serv_addr.sun_path[len] = '\0'; @@ -82,7 +82,7 @@ char c; while (true) { // read characters one by one - int r = recv(sd, &c, 1, 0); + ssize_t r = recv(sd, &c, 1, 0); if (r < 0) { error = "Error reading from socket: "; error += strerror(errno); @@ -112,8 +112,8 @@ string line = request[i]; assert(line.find('\n') == string::npos); line += '\n'; - int p = 0; - int len = line.length(); + size_t p = 0; + size_t len = line.length(); do { r = send(sd, line.c_str()+p, len-p, SOCKET_NOSIGNAL); if (r < 0) { @@ -174,7 +174,7 @@ h.uri = response[i++]; h.fragment = response[i++]; h.mimetype = response[i++]; - h.score = atof(response[i++].c_str()); + h.score = (float)atof(response[i++].c_str()); h.size = atoi(response[i++].c_str()); h.mtime = atoi(response[i++].c_str()); while (i < response.size()) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/socketserver.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/socketserver.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/socketserver.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/socketserver.cpp 2009-12-08 23:40:31.000000000 +0000 @@ -104,7 +104,7 @@ string line; char c; while (true) { - int r = recv(sd, &c, 1, 0); + ssize_t r = recv(sd, &c, 1, 0); if (r < 0) { error = "Error reading from socket: "; error += strerror(errno); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/xesam/xesamlivesearch.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/xesam/xesamlivesearch.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/daemon/xesam/xesamlivesearch.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/daemon/xesam/xesamlivesearch.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -53,7 +53,9 @@ ostringstream str; str << "strigisession" << random(); string name(str.str()); - mkstemp((char*)name.c_str()); + if (mkstemp((char*)name.c_str()) == -1) { + return name; // TODO add error handling + } XesamSession session(*this); p->sessions.insert(make_pair(name, session)); return name; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/dummyindexer/analyzerlatencytester.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/dummyindexer/analyzerlatencytester.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/dummyindexer/analyzerlatencytester.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/dummyindexer/analyzerlatencytester.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -36,7 +36,8 @@ float elapsed(const struct timeval& a, const struct timeval& b) { - return (a.tv_sec - b.tv_sec) + (a.tv_usec - b.tv_usec) / 1.0e6; + return (float)(a.tv_sec - b.tv_sec) + + (float)(a.tv_usec - b.tv_usec) / 1.0e6f; } class LatencyMeasurer : public AnalyzerConfiguration { @@ -58,7 +59,7 @@ class LatencyMeasurer::Private { public: struct timeval starttime, lasttime; - long numberOfChecks; + int32_t numberOfChecks; long numberOfFiles; map histogram; string beforeLastFile; @@ -116,7 +117,7 @@ gettimeofday(&now, NULL); cout << numberOfChecks << " checks in " << numberOfFiles << " files." << endl; - cout << "On average " << (elapsed(now, starttime)/numberOfChecks) + cout << "On average " << (elapsed(now, starttime)/(float)numberOfChecks) << " seconds between checks." << endl; int smallestTime = INT_MAX; int largestTime = INT_MIN; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/htmlgui/strigihtmlgui.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/htmlgui/strigihtmlgui.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/htmlgui/strigihtmlgui.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/htmlgui/strigihtmlgui.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -363,7 +363,7 @@ } i = params.find("deldir"); if (i != params.end()) { - uint oldsize = dirs.size(); + size_t oldsize = dirs.size(); dirs.erase(i->second); if (dirs.size() != oldsize) { p->strigi.setIndexedDirectories(dirs); @@ -462,7 +462,7 @@ out << "
"; string::size_type p = path.find('/'); - int pp = 0; + string::size_type pp = 0; string subpath; while (p != string::npos) { subpath = path.substr(pp, p-pp+1); @@ -480,7 +480,7 @@ out << "" << subpath << ""; out << " - " - << toSizeString(doc.size) << " - " + << toSizeString((int)doc.size) << " - " << h->mimetypeDescription(doc.mimetype) << "
"; /*out << ""; map::const_iterator j; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/luceneindexer/cluceneindexreader.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/luceneindexer/cluceneindexreader.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/luceneindexer/cluceneindexreader.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/luceneindexer/cluceneindexreader.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -627,7 +627,7 @@ } _CLDELETE(docs); - if (id != -1 && reader->isDeleted(id)) { + if (id != -1 && reader->isDeleted((int32_t)id)) { id = -1; } @@ -642,7 +642,7 @@ if (docid < 0) return 0; if (!checkReader(true)) return 0; time_t mtime = 0; - Document *d = reader->document(docid); + Document *d = reader->document((int32_t)docid); if (d) { const TCHAR* v = d->get(Private::mtime()); mtime = atoi(wchartoutf8( v ).c_str()); @@ -793,7 +793,7 @@ set s; wstring prefix = utf8toucs2(keywordmatch); const wchar_t* prefixtext = prefix.c_str(); - uint32_t prefixLen = prefix.length(); + string::size_type prefixLen = prefix.length(); vector::const_iterator i; Term* lastTerm = 0; for (i = fn.begin(); i != fn.end() && s.size() << max; ++i) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/luceneindexer/tcharutils.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/luceneindexer/tcharutils.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/luceneindexer/tcharutils.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/luceneindexer/tcharutils.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -67,19 +67,19 @@ std::string wchartoutf8(const wchar_t* p, const wchar_t* e) { string utf8; - utf8.reserve((int)(1.5*(e-p))); + utf8.reserve((int)(1.5*(float)(e-p))); while (p < e) { wchar_t c = *p; if (c < 0x80) { utf8 += (char)c; } else if (c < 0x800) { char c2 = (char)((c & 0x3f) | 0x80); - utf8 += (c>>6) | 0xc0; + utf8 += (char)((c>>6) | 0xc0); utf8 += c2; } else if (c < 0x10000) { char c3 = (char)((c & 0x3f) | 0x80); char c2 = (char)(((c>>6) & 0x3f) | 0x80); - utf8 += (c>>12) | 0xe0; + utf8 += (char)((c>>12) | 0xe0); utf8 += c2; utf8 += c3; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/analysisresult.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/analysisresult.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/analysisresult.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/analysisresult.cpp 2009-12-08 23:40:31.000000000 +0000 @@ -90,7 +90,7 @@ ICONV_CONST char* inp = (char*)data; char* outp = out; iconv(conv, &inp, &len, &outp, &l); - return (len == 0) ?outlen-l :0; + return (len == 0) ?(int32_t)(outlen-l) :0; } class AnalysisResult::Private { @@ -139,7 +139,7 @@ time_t mt, AnalysisResult& parent) :p(new Private(path, name, mt, *this, parent)) { p->m_writer.startAnalysis(this); - srand(time(NULL)); + srand((unsigned int)time(NULL)); } AnalysisResult::Private::Private(const std::string& p, time_t mt, IndexWriter& w, StreamAnalyzer& indexer, const string& parentpath, @@ -157,7 +157,7 @@ // protocol, which means the parent must be "" and the string must // end in a colon followed by up to three slashes assert(m_parentpath == ""); - int i = m_path.size(); + size_t i = m_path.size(); while (--i > 0 && m_path[i] == '/') {} assert(i > 0 && m_path[i] == ':'); } @@ -219,7 +219,7 @@ return (p->m_parent) ?p->m_parent->path() :p->m_parentpath; } time_t AnalysisResult::mTime() const { return p->m_mtime; } -signed char AnalysisResult::depth() const { return p->m_depth; } +signed char AnalysisResult::depth() const { return (signed char)p->m_depth; } int64_t AnalysisResult::id() const { return p->m_id; } void AnalysisResult::setId(int64_t i) { p->m_id = i; } void AnalysisResult::setEncoding(const char* enc) { p->m_encoding = enc; } @@ -262,7 +262,7 @@ } else { Latin1Converter::lock(); char* d; - size_t len = Latin1Converter::fromLatin1(d, text, length); + int32_t len = Latin1Converter::fromLatin1(d, text, length); if (len && checkUtf8(d, len)) { p->m_writer.addText(this, d, len); } else { @@ -312,7 +312,8 @@ } else { Latin1Converter::lock(); char* d; - size_t len = Latin1Converter::fromLatin1(d, val.c_str(), val.length()); + int32_t len = Latin1Converter::fromLatin1(d, val.c_str(), + (int32_t)val.length()); if (len && checkUtf8(d, len)) { p->m_writer.addValue(this, field, (const unsigned char*)d, len); } else { @@ -334,7 +335,7 @@ } else { Latin1Converter::lock(); char* d; - size_t len = Latin1Converter::fromLatin1(d, data, length); + int32_t len = Latin1Converter::fromLatin1(d, data, length); if (len && checkUtf8(d, len)) { p->m_writer.addValue(this, field, (const unsigned char*)d, len); } else { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/bmpendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/bmpendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/bmpendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/bmpendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -65,12 +65,14 @@ signed char BmpEndAnalyzer::analyze(AnalysisResult& rs, InputStream* in) { // read BMP file type and ensure it is not damaged + /* const char * bmptype_bm = "BM"; const char * bmptype_ba = "BA"; const char * bmptype_ci = "CI"; const char * bmptype_cp = "CP"; const char * bmptype_ic = "IC"; const char * bmptype_pt = "PT"; + */ const char* bmp_id; in->read(bmp_id, 2, 2); @@ -104,8 +106,8 @@ rs.addValue(factory->heightField, height); uint32_t colorDepth = readLittleEndianUInt16(h+28); rs.addValue(factory->colorDepthField, colorDepth); +/* //FIXME: either get rid of this or replace with NIE equivalent uint32_t bmpi_compression = readLittleEndianUInt32(h+30); -/* //FIXME: either get rid of this or replace with NIE equivalent switch (bmpi_compression) { case 0 : rs.addValue(factory->compressionField, "None"); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/bz2endanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/bz2endanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/bz2endanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/bz2endanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -51,7 +51,7 @@ return r; }*/ // since this is bz2 file, its likely that it contains a tar file - const char* start; + const char* start = 0; int32_t nread = stream.read(start, 1024, 0); if (nread < -1) { fprintf(stderr, "Error reading bz2: %s\n", stream.error()); @@ -63,7 +63,7 @@ return TarEndAnalyzer::staticAnalyze(idx, &stream); } else { std::string name = idx.fileName(); - int len = name.length(); + size_t len = name.length(); if (len > 4 && name.substr(len-4)==".bz2") { name = name.substr(0, len-4); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -206,9 +206,9 @@ string name(p2, eq); // convert field name to lower case - const int length = name.length(); - for(int k=0; k!=length; ++k) { - name[k] = std::tolower(name[k]); + const size_t length = name.length(); + for(size_t k=0; k!=length; ++k) { + name[k] = (char)std::tolower(name[k]); } // check if we can handle this field and if so handle it @@ -225,7 +225,8 @@ indexable.addTriplet(artistUri, typePropertyName, contactClassName); indexable.addTriplet(artistUri, fullnamePropertyName, value); } else if(name=="lyrics") { - indexable.addText(value.c_str(), value.length()); + indexable.addText(value.c_str(), + (int32_t)value.length()); } else if(name=="albumartist") { const string albumArtistUri( indexable.newAnonymousUri() ); addStatement(indexable, albumUri, albumArtistPropertyName, albumArtistUri); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/gzipendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/gzipendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/gzipendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/gzipendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -46,7 +46,7 @@ GZipInputStream stream(in); // since this is gzip file, its likely that it contains a tar file - const char* start; + const char* start = 0; int32_t nread = stream.read(start, 1024, 0); if (nread < -1) { printf("Error reading gzip: %s\n", stream.error()); @@ -60,7 +60,7 @@ return TarEndAnalyzer::staticAnalyze(idx, &stream); } else { std::string file = idx.fileName(); - int len = file.length(); + size_t len = file.length(); if (len > 3 && file.substr(len-3) == ".gz") { file = file.substr(0, len-3); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/helperendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/helperendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/helperendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/helperendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -213,7 +213,7 @@ unlink(p); return ""; } - nread -= n; + nread -= (int32_t)n; } while (nread > 0); nread = in->read(b, 1, 0); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/id3endanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/id3endanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/id3endanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/id3endanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -398,14 +398,15 @@ if (strncmp("APIC", p, 4) == 0) { size_t mimelen = strnlen(p+11, size-1); - if (mimelen 5 && name.substr(len-5)==".lzma") { name = name.substr(0, len-5); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -251,7 +251,7 @@ if(nread < 4) return false; dword = readBigEndianUInt32(buf); - uint8_t type = dword >> 28; + uint8_t type = (uint8_t)(dword >> 28); if(type == 1 ) { this->mpeg_version = 2; @@ -275,7 +275,7 @@ if(nread < 1) return false; subtype = (uint8_t)*buf; - subtype = subtype >> 4; + subtype = (uint8_t)(subtype >> 4); if (subtype == 8) // AC3 this->audio_type = 5; else diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.h --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.h 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.h 2009-12-08 23:40:32.000000000 +0000 @@ -62,14 +62,14 @@ { this->frame_rate_table[0] = 0.0; /* Pad */ //Official frame rates - this->frame_rate_table[1] = (float)24000.0/1001.0; - this->frame_rate_table[2] = (float)24.0; - this->frame_rate_table[3] = (float)25.0; - this->frame_rate_table[4] = (float)30000.0/1001.0; - this->frame_rate_table[5] = (float)30.0; - this->frame_rate_table[6] = (float)50.0; - this->frame_rate_table[7] = (float)60000.0/1001.0; - this->frame_rate_table[8] = (float)60.0; + this->frame_rate_table[1] = 24000.0f/1001.0f; + this->frame_rate_table[2] = 24.0f; + this->frame_rate_table[3] = 25.0f; + this->frame_rate_table[4] = 30000.0f/1001.0f; + this->frame_rate_table[5] = 30.0f; + this->frame_rate_table[6] = 50.0f; + this->frame_rate_table[7] = 60000.0f/1001.0f; + this->frame_rate_table[8] = 60.0f; // Unofficial economy rates this->frame_rate_table[9] = 1; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/oleendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/oleendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/oleendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/oleendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -90,7 +90,8 @@ char* c = out; char* end = out+len; while (c < end && *c) { - switch (*c) { + int cvalue = *c; + switch (cvalue) { case 1: // ? case 2: // ? case 7: // cell/row end @@ -130,12 +131,14 @@ } void OleEndAnalyzerFactory::registerFields(FieldRegister& reg) { - static const char summaryKey[] = {0xE0,0x85,0x9F,0xF2,0xF9,0x4F,0x68,0x10, + static const unsigned char summaryKey[] = { + 0xE0,0x85,0x9F,0xF2,0xF9,0x4F,0x68,0x10, 0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9}; - static const char docSummaryKey[]= {0x02,0xD5,0xCD,0xD5,0x9C,0x2E,0x1B,0x10, + static const unsigned char docSummaryKey[]= { + 0x02,0xD5,0xCD,0xD5,0x9C,0x2E,0x1B,0x10, 0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE}; string key; - key.assign(summaryKey, 16); + key.assign((const char*)summaryKey, 16); map* m = &fieldsMaps[key]; // register the fields for the Summary Information Stream @@ -158,7 +161,7 @@ addField((*m)[6]); // register the fields for the Document Summary Information Stream - key.assign(docSummaryKey, 16); + key.assign((const char*)docSummaryKey, 16); m = &fieldsMaps[key]; /* //FIXME: either get rid of this or replace with NIE equivalent (*m)[2] = reg.registerField("http://strigi.sf.net/ontologies/homeless#oleCategory"); @@ -225,7 +228,7 @@ wordtext.addText(d+dp, size); } wordtext.cleanText(); - ar.addText(wordtext.text(), wordtext.length()); + ar.addText(wordtext.text(), (int32_t)wordtext.length()); wordtext.reset(); return true; } @@ -273,7 +276,7 @@ bool OleEndAnalyzer::tryPropertyStream(AnalysisResult& idx, InputStream* in) { - static const char magic[] = {0xfe, 0xff, 0, 0}; + static const unsigned char magic[] = {0xfe, 0xff, 0, 0}; const char* d; uint32_t nread = in->read(d, 28, 28); in->reset(0); @@ -281,7 +284,7 @@ return false; } // read all the data - nread = in->read(d, in->size(), in->size()); + nread = in->read(d, (uint32_t)in->size(), (uint32_t)in->size()); if (nread != in->size()) { return false; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/pdfendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/pdfendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/pdfendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/pdfendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -48,7 +48,7 @@ } StreamStatus PdfEndAnalyzer::handle(const std::string& s) { - analysisresult->addText(s.c_str(), s.length()); + analysisresult->addText(s.c_str(), (uint32_t)s.length()); return Ok; } bool @@ -63,5 +63,5 @@ if (r != Eof) m_error.assign(parser.error()); analysisresult->addValue(factory->typeField, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#PaginatedTextDocument"); - return (r == Eof) ?0 :-1; + return (r == Eof) ?(signed char)0 :(signed char)-1; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/pngendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/pngendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/pngendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/pngendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -32,6 +32,7 @@ using namespace std; using namespace Strigi; +/* // and for the colors static const char* colors[] = { "Grayscale", @@ -42,6 +43,7 @@ "Unknown", "RGB/Alpha" }; +*/ static const char* interlaceModes[] = { "None", @@ -173,10 +175,10 @@ // the channel count switch (type) { case 0: break; // Grayscale - case 2: bpp *= 3; break; // RGB + case 2: bpp = (uint16_t)(3*bpp); break; // RGB case 3: break; // palette - case 4: bpp *= 2; break; // grayscale w. alpha - case 6: bpp *= 4; break; // RGBA + case 4: bpp = (uint16_t)(2*bpp); break; // grayscale w. alpha + case 6: bpp = (uint16_t)(4*bpp); break; // RGBA default: // we don't get any sensible value here bpp = 0; @@ -314,7 +316,7 @@ // FIXME the chunck is UTC but mktime use the local timezone :-( // so i have to add the offset of the local time zone // If someone has a better solution... - uint32_t time = sinceEpoch + timeZoneOffset; + time_t time = sinceEpoch + timeZoneOffset; as.addValue(factory->lastModificationTimeField, (uint32_t)time); return 0; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/textendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/textendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/textendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/textendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -57,7 +57,7 @@ idx.addText(b, nread); } else if (nb) { retval = 0; - idx.addText(b, last-b); + idx.addText(b, (uint32_t)(last-b)); } } if (in->status() == Error) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/zipexeendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/zipexeendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endanalyzers/zipexeendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endanalyzers/zipexeendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -34,7 +34,7 @@ bool ZipExeEndAnalyzer::checkHeader(const char* header, int32_t headersize) const { - static const char magic[] = {0x4d, 0x5a, 0x90, 0x00}; + static const unsigned char magic[] = {0x4d, 0x5a, 0x90, 0x00}; if (headersize < 4) return false; bool ok = std::memcmp(header, magic, 4) == 0; return ok; @@ -69,7 +69,7 @@ // zip analyzer has read too much, we cannot recover return -1; } - offset = in->reset(i); + offset = (uint32_t)in->reset(i); if (offset != i) { return r; } @@ -78,7 +78,7 @@ if (nread <= 0 || in->status() == Error) { return -1; } - offset = in->reset(i); + offset = (uint32_t)in->reset(i); } } return -1; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endplugins/jpegendanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endplugins/jpegendanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/endplugins/jpegendanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/endplugins/jpegendanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -320,7 +320,7 @@ #endif data = (const char*)thumbnail.pData_; if (data) { - StringInputStream thumbstream(data, thumbnail.size_, false); + StringInputStream thumbstream(data, (int32_t)thumbnail.size_, false); string thumbname("thumbnail"); #if (EXIV2_TEST_VERSION(0,17,91)) ar.indexChild(thumbname + thumb.extension(), ar.mTime(), diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/eventanalyzers/mimeeventanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/eventanalyzers/mimeeventanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/eventanalyzers/mimeeventanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/eventanalyzers/mimeeventanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -190,7 +190,7 @@ fprintf(stderr, "'%s' ended unexpectedly.\n", file.c_str()); return; } - rule.offset = atol(lpos); + rule.offset = (uint32_t)atol(lpos); lpos = ++pos; if (end-pos < 2) { fprintf(stderr, "'%s' ended unexpectedly.\n", file.c_str()); @@ -215,7 +215,8 @@ rule.mask = (unsigned char*)malloc(len); memcpy(rule.mask, pos, len); for (uint16_t i = 0; i < len; ++i) { - rule.value[i] = rule.mask[i] & rule.value[i]; + rule.value[i] = + (unsigned char)(rule.mask[i] & rule.value[i]); } pos += len; } else { @@ -250,7 +251,7 @@ fprintf(stderr, "'%s' ended unexpectedly.\n", file.c_str()); return; } - rule.range = atol(lpos); + rule.range = (uint32_t)atol(lpos); if (rule.range < rule.offset) { rule.range = rule.offset; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/fieldpropertiesdb.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/fieldpropertiesdb.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/fieldpropertiesdb.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/fieldpropertiesdb.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -345,7 +345,7 @@ int strigi_xmlFileRead(void* context, char* buffer, int len) { FILE* f = (FILE*)context; - return fread(buffer, 1, len, f); + return (int)fread(buffer, 1, len, f); } int strigi_xmlFileClose(void*) { @@ -414,7 +414,7 @@ newEntity.type = XML_ENTITY_DECL; newEntity.name = (xmlChar*)new char[stdname.size()+1]; strcpy((char*)newEntity.name, stdname.c_str()); - newEntity.length = strlen((const char*)content); + newEntity.length = (int)strlen((const char*)content); newEntity.orig = (xmlChar*)new char[newEntity.length+1]; strcpy((char*)newEntity.orig, (const char*)content); newEntity.content = newEntity.orig; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/filelister.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/filelister.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/filelister.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/filelister.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -87,9 +87,9 @@ DIR** dirs; DIR** dirsEnd; DIR** curDir; - int* len; - int* lenEnd; - int* curLen; + string::size_type* len; + string::size_type* lenEnd; + string::size_type* curLen; time_t mtime; struct dirent* subdir; struct stat dirstat; @@ -119,7 +119,7 @@ int nOpenDirs = 100; dirs = (DIR**)malloc(sizeof(DIR*)*nOpenDirs); dirsEnd = dirs + nOpenDirs; - len = (int*)malloc(sizeof(int)*nOpenDirs); + len = (string::size_type*)malloc(sizeof(string::size_type)*nOpenDirs); lenEnd = len + nOpenDirs; curDir = dirs - 1; } @@ -128,7 +128,7 @@ listedDirs.clear(); curDir = dirs; curLen = len; - int len = dir.length(); + string::size_type len = dir.length(); *curLen = len; strcpy(path, dir.c_str()); if (len) { @@ -164,7 +164,7 @@ while (curDir >= dirs) { DIR* dir = *curDir; - int l = *curLen; + string::size_type l = *curLen; subdir = readdir(dir); while (subdir) { // skip the directories '.' and '..' @@ -177,12 +177,12 @@ } } strcpy(path + l, subdir->d_name); - int sl = l + strlen(subdir->d_name); + string::size_type sl = l + strlen(subdir->d_name); if (strigi_lstat(path, &dirstat) == 0) { if (S_ISREG(dirstat.st_mode)) { if (config == 0 || config->indexFile(path, path+l)) { mtime = dirstat.st_mtime; - return sl; + return (int)sl; } } else if (dirstat.st_mode & S_IFDIR && (config == 0 || config->indexDir(path, path+l))) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/lineeventanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/lineeventanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/lineeventanalyzer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/lineeventanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -42,7 +42,7 @@ #define CONVBUFSIZE 65536 LineEventAnalyzer::LineEventAnalyzer(vector& l) - :line(l), converter((iconv_t)-1), numAnalyzers(l.size()), + :line(l), converter((iconv_t)-1), numAnalyzers((uint)l.size()), convBuffer(new char[CONVBUFSIZE]), ready(true), initialized(false) { started = new bool[l.size()]; for (uint i=0; i 0) { - emitData(lineBuffer.c_str(), lineBuffer.size()); + emitData(lineBuffer.c_str(), (uint32_t)lineBuffer.size()); lineBuffer.assign(""); } @@ -124,7 +124,7 @@ if (iMissingBytes) { if (iMissingBytes > length) { ibyteBuffer.append(data, length); - iMissingBytes -= length; + iMissingBytes = (unsigned char)(iMissingBytes - length); return; } else { ibyteBuffer.append(data, iMissingBytes); @@ -139,7 +139,7 @@ ready = true; return; } - handleUtf8Data(convBuffer, CONVBUFSIZE-outbytesleft); + handleUtf8Data(convBuffer, (uint32_t)(CONVBUFSIZE-outbytesleft)); } } do { @@ -149,17 +149,18 @@ outbytesleft = CONVBUFSIZE; r = iconv(converter, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + int32_t left = (uint32_t)(CONVBUFSIZE-outbytesleft); if (r == (size_t)-1) { uint32_t read; switch (errno) { case EINVAL: // last character is incomplete - handleUtf8Data(convBuffer, CONVBUFSIZE-outbytesleft); + handleUtf8Data(convBuffer, left); ibyteBuffer.assign(inbuf, inbytesleft); - iMissingBytes = length - (inbuf-data); + iMissingBytes = (unsigned char)(length - (inbuf-data)); return; case E2BIG: // output buffer is full - handleUtf8Data(convBuffer, CONVBUFSIZE-outbytesleft); - read = inbuf-data; + handleUtf8Data(convBuffer, left); + read = (uint32_t)(inbuf-data); data += read; length -= read; break; @@ -169,7 +170,7 @@ return; } } else { //input sequence was completely converted - handleUtf8Data(convBuffer, CONVBUFSIZE-outbytesleft); + handleUtf8Data(convBuffer, left); return; } } while (true); @@ -207,7 +208,7 @@ } else { // not enough data, store it and wait for the next round byteBuffer.append(data, length); - missingBytes -= length; + missingBytes = (unsigned char)(missingBytes - length); return; } } @@ -217,12 +218,12 @@ if (p) { // the data ends in an incomplete character if (missingBytes > 0) { - int32_t charStartSize = length - (p - data); + string::size_type charStartSize = length - (p - data); // store the start of the character byteBuffer.assign(p, charStartSize); // do not consider this incomplete character in the rest of this // function - length -= charStartSize; + length = (uint32_t)(length - charStartSize); } else { // not valid ready = true; @@ -256,10 +257,10 @@ // handle the first line from this call if (lineBuffer.size()) { lineBuffer.append(data, lineend-data); - emitData(lineBuffer.c_str(), lineBuffer.size()); + emitData(lineBuffer.c_str(), (uint32_t)lineBuffer.size()); lineBuffer.assign(""); } else { - emitData(data, p-data); + emitData(data, (uint32_t)(p-data)); } if (ready) return; @@ -284,7 +285,7 @@ sawCarriageReturn = true; } } - emitData(data, lineend-data); + emitData(data, (uint32_t)(lineend-data)); if (ready) return; } } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/sha1.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/sha1.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/sha1.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/sha1.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -88,8 +88,8 @@ void SHA1::transform(void *data) { - unsigned int a, b, c, d, e, tm; - unsigned int x[16]; + long a, b, c, d, e, tm; + long x[16]; unsigned char *_data = (unsigned char *)data; a = _h0; @@ -265,7 +265,7 @@ process(0, 0); msb = 0; - t = _nblocks; + t = (unsigned int)_nblocks; if ((lsb = t << 6) < t) { msb++; @@ -300,14 +300,14 @@ memset(_buf, 0, 56); } - _buf[56] = msb >> 24; - _buf[57] = msb >> 16; - _buf[58] = msb >> 8; - _buf[59] = msb; - _buf[60] = lsb >> 24; - _buf[61] = lsb >> 16; - _buf[62] = lsb >> 8; - _buf[63] = lsb; + _buf[56] = (unsigned char)(msb >> 24); + _buf[57] = (unsigned char)(msb >> 16); + _buf[58] = (unsigned char)(msb >> 8); + _buf[59] = (unsigned char)(msb); + _buf[60] = (unsigned char)(lsb >> 24); + _buf[61] = (unsigned char)(lsb >> 16); + _buf[62] = (unsigned char)(lsb >> 8); + _buf[63] = (unsigned char)(lsb); transform(_buf); @@ -316,8 +316,12 @@ #ifdef __BIG_ENDIAN__ #define X(a) do { *(uint32_t *)p = _h##a; p += 4; } while (0) #else -#define X(a) do { *p++ = _h##a >> 24; *p++ = _h##a >> 16; \ - *p++ = _h##a >> 8; *p++ = _h##a; } while (0) +#define X(a) do { \ + *p++ = (unsigned char)(_h##a >> 24); \ + *p++ = (unsigned char)(_h##a >> 16); \ + *p++ = (unsigned char)(_h##a >> 8); \ + *p++ = (unsigned char)(_h##a); \ +} while (0) #endif X(0); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/streamanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/streamanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/streamanalyzer.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/streamanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -412,8 +412,8 @@ headersize = -1; finished = true; } - int es = 0; - int itersize = eIter->size(); + size_t es = 0; + size_t itersize = eIter->size(); while (!finished && es != itersize) { StreamEndAnalyzer* sea = (*eIter)[es]; if (sea->checkHeader(header, headersize)) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/throughanalyzers/oggthroughanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/throughanalyzers/oggthroughanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/throughanalyzers/oggthroughanalyzer.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/throughanalyzers/oggthroughanalyzer.cpp 2009-12-08 23:40:31.000000000 +0000 @@ -137,9 +137,9 @@ if (size > eq) { string name(p2, eq); // convert field name to lower case - const int length = name.length(); - for(int k=0; k!=length; ++k) { - name[k] = std::tolower(name[k]); + const string::size_type length = name.length(); + for(string::size_type k=0; k!=length; ++k) { + name[k] = (char)std::tolower(name[k]); } // check if we can handle this field and if so handle it map::const_iterator iter diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/throughplugins/authroughanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/throughplugins/authroughanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/throughplugins/authroughanalyzer.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/throughplugins/authroughanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -85,7 +85,7 @@ // we skip 8 bytes: 4 for the magic number + 4 for data pointer uint32_t dataSize = readBigEndianUInt32(buf+8); - uint32_t encoding = readBigEndianUInt32(buf+12); + //uint32_t encoding = readBigEndianUInt32(buf+12); uint32_t sampleRate = readBigEndianUInt32(buf+16); uint32_t channels = readBigEndianUInt32(buf+20); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/throughplugins/gifthroughanalyzer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/throughplugins/gifthroughanalyzer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/throughplugins/gifthroughanalyzer.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/throughplugins/gifthroughanalyzer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -113,7 +113,7 @@ analysisResult->addValue(factory->heightField, (uint32_t)height); if (buf[4] == 7) { - uint8_t colorDepth = (buf[9] & 0x07) + 1; + uint8_t colorDepth = (uint8_t)((buf[9] & 0x07) + 1); analysisResult->addValue(factory->colorDepthField, (uint32_t)colorDepth); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/variant.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/variant.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/variant.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/variant.cpp 2009-12-08 23:40:31.000000000 +0000 @@ -170,7 +170,7 @@ case Variant::s_val: return atoi(s_value.c_str()); case Variant::as_val: - return as_value.size(); + return (int32_t)as_value.size(); default: return -1; } @@ -189,7 +189,7 @@ case Variant::s_val: return atoi(s_value.c_str()); case Variant::as_val: - return as_value.size(); + return (int32_t)as_value.size(); default: return ~0U; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/xesam/stack.hh /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/xesam/stack.hh --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/xesam/stack.hh 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/xesam/stack.hh 2009-12-08 23:40:32.000000000 +0000 @@ -86,7 +86,7 @@ } inline - unsigned int + std::string::size_type height () const { return seq_.size (); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/xesam/XesamQLParser.cc /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/xesam/XesamQLParser.cc --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/xesam/XesamQLParser.cc 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/xesam/XesamQLParser.cc 2009-12-08 23:40:32.000000000 +0000 @@ -57,8 +57,9 @@ LIBXML_TEST_VERSION // FIXME: encoding may not be UTF-8 - xmlParserInputBufferPtr pBuffer = xmlParserInputBufferCreateMem(xesam_query.c_str(), - xesam_query.length(), XML_CHAR_ENCODING_UTF8); + xmlParserInputBufferPtr pBuffer = xmlParserInputBufferCreateMem( + xesam_query.c_str(), (int)xesam_query.length(), + XML_CHAR_ENCODING_UTF8); if (pBuffer == NULL) { STRIGI_LOG_ERROR ("XesamQLParser.parse", "could not create input buffer") diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/xesam/xesam_ul_file_scanner.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/xesam/xesam_ul_file_scanner.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/xesam/xesam_ul_file_scanner.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/xesam/xesam_ul_file_scanner.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -47,7 +47,7 @@ char XesamUlFileScanner::peekCh() { - return m_ifstream.peek(); + return (char)m_ifstream.peek(); } bool XesamUlFileScanner::eof() diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/xesam/xesam_ul_scanner.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/xesam/xesam_ul_scanner.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streamanalyzer/xesam/xesam_ul_scanner.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streamanalyzer/xesam/xesam_ul_scanner.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -209,7 +209,7 @@ else if ((ch == '&') && !eof() && (peekCh() == '&')) { // yy::xesam_ul_parser::token::AND (&&) ch = getCh(); - read = ch + ch; + read = (char)(ch + ch); // set yylval *yylval = read; STRIGI_LOG_DEBUG ("XesamUlScanner::yylex", @@ -219,7 +219,7 @@ else if ((ch == '|') && !eof() && (peekCh() == '|')) { // yy::xesam_ul_parser::token::OR (||) ch = getCh(); - read = ch + ch; + read = (char)(ch + ch); // set yylval *yylval = read; STRIGI_LOG_DEBUG ("XesamUlScanner::yylex", "yy::xesam_ul_parser::token::OR") diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/archivereader.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/archivereader.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/archivereader.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/archivereader.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -265,7 +265,7 @@ e.filename.length()) == 0) { nextstream = true; // skip the number of entries that are matched - uint end = *i + e.filename.length(); + size_t end = *i + e.filename.length(); do { ++i; } while (i != partpos.rend() && *i < end); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/base64inputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/base64inputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/base64inputstream.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/base64inputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -61,7 +61,7 @@ for (int i=64; i<256; ++i) { inalphabet[i] = 0; } - for (int i=0; i<64; ++i) { + for (unsigned char i=0; i<64; ++i) { inalphabet[alphabet[i]] = true; decoder[alphabet[i]] = i; } @@ -114,13 +114,13 @@ if (bytestodo) { switch (bytestodo) { case 3: - *start = bits >> 16; + *start = (char)(bits >> 16); break; case 2: - *start = (bits >> 8) & 0xff; + *start = (char)((bits >> 8) & 0xff); break; case 1: - *start = bits & 0xff; + *start = (char)(bits & 0xff); bits = 0; char_count = 0; break; @@ -156,19 +156,19 @@ bytestodo = 3; break; } - *p++ = bits >> 16; + *p++ = (char)(bits >> 16); if (p >= end) { bytestodo = 2; nwritten++; break; } - *p++ = (bits >> 8) & 0xff; + *p++ = (char)((bits >> 8) & 0xff); if (p >= end) { bytestodo = 1; nwritten += 2; break; } - *p++ = bits & 0xff; + *p++ = (char)(bits & 0xff); bits = 0; char_count = 0; nwritten += 3; @@ -188,7 +188,7 @@ string d; if (length%4) return d; initialize(); - int32_t words = length/4; + string::size_type words = length/4; d.reserve(words*3); const unsigned char* c = (const unsigned char*)in; const unsigned char* e = c + length; @@ -201,9 +201,9 @@ && inalphabet[c[3]]) { k = decoder[c[1]]; l = decoder[c[2]]; - b[0] = (decoder[c[0]] << 2) + (k >> 4); - b[1] = (k << 4) + (l >> 2); - b[2] = (l << 6) + (decoder[c[3]]); + b[0] = (char)((decoder[c[0]] << 2) + (k >> 4)); + b[1] = (char)((k << 4) + (l >> 2)); + b[2] = (char)((l << 6) + (decoder[c[3]])); d.append(b, 3); } else { return string(); @@ -211,7 +211,7 @@ } if (in[length-2] == '=') { if (inalphabet[c[0]] && inalphabet[c[1]]) { - b[0] = (decoder[c[0]] << 2)+((decoder[c[1]] >> 4)); + b[0] = (char)((decoder[c[0]] << 2)+((decoder[c[1]] >> 4))); d.append(b, 1); } else { return string(); @@ -219,8 +219,8 @@ } else if (in[length-1] == '=') { if (inalphabet[c[0]] && inalphabet[c[1]] && inalphabet[c[2]]) { k = decoder[c[1]]; - b[0] = (decoder[c[0]] << 2) + (k >> 4); - b[1] = (k << 4) + (decoder[c[2]] >> 2); + b[0] = (char)((decoder[c[0]] << 2) + (k >> 4)); + b[1] = (char)((k << 4) + (decoder[c[2]] >> 2)); d.append(b, 2); } else { return string(); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/CMakeLists.txt /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/CMakeLists.txt --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/CMakeLists.txt 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/CMakeLists.txt 2009-12-08 23:40:30.000000000 +0000 @@ -32,7 +32,7 @@ oleinputstream.cpp rpminputstream.cpp sdfinputstream.cpp - signatureinputstream.cpp +# signatureinputstream.cpp # not done yet skippingfileinputstream.cpp skippingfileinputstream2.cpp stringterminatedsubstream.cpp diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/cpioinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/cpioinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/cpioinputstream.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/cpioinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -104,10 +104,10 @@ m_error = "Error parsing entry field."; return; } - char namepadding = (filenamesize+2) % 4; - if (namepadding) namepadding = 4 - namepadding; - padding = m_entryinfo.size % 4; - if (padding) padding = 4 - padding; + char namepadding = (char)((filenamesize+2) % 4); + if (namepadding) namepadding = (char)(4 - namepadding); + padding = (char)(m_entryinfo.size % 4); + if (padding) padding = (char)(4 - padding); // read filename toread = filenamesize + namepadding; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/dostime.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/dostime.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/dostime.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/dostime.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -47,12 +47,12 @@ /* Call localtime to initialize timezone in TIME. */ ltime = *localtime (&now); - ltime.tm_year = (dostime >> 25) + 80; - ltime.tm_mon = ((dostime >> 21) & 0x0f) - 1; - ltime.tm_mday = (dostime >> 16) & 0x1f; - ltime.tm_hour = (dostime >> 11) & 0x0f; - ltime.tm_min = (dostime >> 5) & 0x3f; - ltime.tm_sec = (dostime & 0x1f) << 1; + ltime.tm_year = (int)(dostime >> 25) + 80; + ltime.tm_mon = ((int)(dostime >> 21) & 0x0f) - 1; + ltime.tm_mday = (int)(dostime >> 16) & 0x1f; + ltime.tm_hour = (int)(dostime >> 11) & 0x0f; + ltime.tm_min = (int)(dostime >> 5) & 0x3f; + ltime.tm_sec = (int)(dostime & 0x1f) << 1; ltime.tm_wday = -1; ltime.tm_yday = -1; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/encodinginputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/encodinginputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/encodinginputstream.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/encodinginputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -103,12 +103,12 @@ // the buffer std::memmove(charbuf.start, inbuf, inbytesleft); charbuf.readPos = charbuf.start; - charbuf.avail = inbytesleft; - nwritten = outbuf - start; + charbuf.avail = (int32_t)inbytesleft; + nwritten = (int32_t)(outbuf - start); break; case E2BIG: // output buffer is full charbuf.readPos += charbuf.avail - inbytesleft; - charbuf.avail = inbytesleft; + charbuf.avail = (int32_t)inbytesleft; nwritten = space; break; default: @@ -123,7 +123,7 @@ } else { //input sequence was completely converted charbuf.readPos = charbuf.start; charbuf.avail = 0; - nwritten = outbuf - start; + nwritten = (int32_t)(outbuf - start); if (input == 0) { finishedEncoding = true; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/fileinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/fileinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/fileinputstream.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/fileinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -81,7 +81,7 @@ } // allocate memory in the buffer - int32_t bufsize = (m_size <= buffersize) ?m_size+1 :buffersize; + int32_t bufsize = (m_size <= buffersize) ?(int32_t)m_size+1 :buffersize; setMinBufSize(bufsize); } FileInputStream::~FileInputStream() { @@ -96,7 +96,7 @@ FileInputStream::fillBuffer(char* start, int32_t space) { if (file == 0) return -1; // read into the buffer - int32_t nwritten = fread(start, 1, space, file); + int32_t nwritten = (int32_t)fread(start, 1, space, file); // check the file stream status if (ferror(file)) { m_error = "Could not read from file '" + filepath + "'."; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/inputstreamreader.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/inputstreamreader.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/inputstreamreader.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/inputstreamreader.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -89,12 +89,12 @@ // the buffer std::memmove(charbuf.start, inbuf, inbytesleft); charbuf.readPos = charbuf.start; - charbuf.avail = inbytesleft; - nwritten = ((wchar_t*)outbuf) - start; + charbuf.avail = (int32_t)inbytesleft; + nwritten = (int32_t)(((wchar_t*)outbuf) - start); break; case E2BIG: // output buffer is full charbuf.readPos += charbuf.avail - inbytesleft; - charbuf.avail = inbytesleft; + charbuf.avail = (int32_t)inbytesleft; nwritten = space; break; default: @@ -109,7 +109,7 @@ } else { //input sequence was completely converted charbuf.readPos = charbuf.start; charbuf.avail = 0; - nwritten = ((wchar_t*)outbuf) - start; + nwritten = (int32_t)(((wchar_t*)outbuf) - start); if (input == 0) { finishedDecoding = true; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/kmpsearcher.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/kmpsearcher.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/kmpsearcher.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/kmpsearcher.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -96,7 +96,7 @@ void KmpSearcher::setQuery(const string& query) { m_query = query; - len = query.length(); + len = (int32_t)query.length(); const char* p = query.c_str(); int32_t tablesize = 4 * (257+len); if (table) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/lzmainputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/lzmainputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/lzmainputstream.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/lzmainputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -138,15 +138,15 @@ SizeT inProcessed = avail_in; ELzmaFinishMode finishMode = LZMA_FINISH_ANY; int64_t bytesTodo = p->m_size - bytesDecompressed; - if (p->m_size != -1 && outProcessed > bytesTodo) { + if (p->m_size != -1 && outProcessed > (SizeT)bytesTodo) { outProcessed = (SizeT)bytesTodo; finishMode = LZMA_FINISH_END; } ELzmaStatus status; SRes res = LzmaDec_DecodeToBuf(&state, (Byte*)start, &outProcessed, (const Byte*)next_in, &inProcessed, finishMode, &status); - avail_in -= inProcessed; - next_in += inProcessed; + avail_in -= (int32_t)inProcessed; + next_in += (int32_t)inProcessed; bytesDecompressed += outProcessed; if (res != SZ_OK) { ostringstream str; @@ -167,5 +167,5 @@ } else if (status == LZMA_STATUS_FINISHED_WITH_MARK) { p->m_size = bytesDecompressed; } - return outProcessed; + return (int32_t)outProcessed; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/mailinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/mailinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/mailinputstream.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/mailinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -47,9 +47,9 @@ char decodeHex(char h) { - if (h >= 'A' && h <= 'F') return 10+h-'A'; - if (h >= 'a' && h <= 'f') return 10+h-'a'; - return h - '0'; + if (h >= 'A' && h <= 'F') return (char)(10+h-'A'); + if (h >= 'a' && h <= 'f') return (char)(10+h-'a'); + return (char)(h - '0'); } class Decoder { @@ -119,7 +119,7 @@ while (v < end) { if (*v == '=' && end - v > 2 && isxdigit(v[1]) && isxdigit(v[2])) { decoded.append(pos, v - pos); - c = decodeHex(v[1])*16 + decodeHex(v[2]); + c = (char)(decodeHex(v[1])*16 + decodeHex(v[2])); decoded.append(&c, 1); pos = v = v + 3; } else if (*v == '_') { @@ -175,7 +175,7 @@ } decoded.append(str); } else if (*q1 == 'q' || *q1 =='Q') { - string& str(decodeQuotedPrintable(q2, end-q2)); + string& str(decodeQuotedPrintable(q2, (char)(end-q2))); if (strncasecmp("utf-8", s, 5) != 0) { string encoding(s, q1-s-1); decode(encoding, str); @@ -449,9 +449,9 @@ MailInputStream::Private::scanBody() { while (m->m_status == Ok) { readHeaderLine(); - int32_t len = lineend - linestart; + int32_t len = (int32_t)(lineend - linestart); if (len > 2 && strncmp("--", linestart, 2) == 0) { - int32_t blen = boundary.top().length(); + int32_t blen = (int32_t)boundary.top().length(); if (len == blen + 4 && strncmp(linestart + 2 + blen, "--", 2) == 0 && strncmp(linestart + 2, boundary.top().c_str(), blen) == 0) { @@ -483,7 +483,7 @@ static const char* references = "References:"; static const char* contenttransferencoding = "Content-Transfer-Encoding:"; static const char* contentdisposition = "Content-Disposition:"; - int32_t len = lineend - linestart; + int32_t len = (int32_t)(lineend - linestart); if (len < 2) return; if (len < 8) { return; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/mmapfileinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/mmapfileinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/mmapfileinputstream.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/mmapfileinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -74,7 +74,7 @@ int32_t n = max(_min, _max); if (n >= m_size - m_position) { m_status = Eof; - n = m_size - m_position; + n = (int32_t)(m_size - m_position); } start = buffer + m_position; m_position += n; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/oleinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/oleinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/oleinputstream.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/oleinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -101,7 +101,7 @@ int32_t n = space; int32_t avail = blocksize-blockoffset; if (avail > m_size-done) { - avail = m_size-done; + avail = (int32_t)(m_size-done); } if (n > avail) { n = avail; @@ -190,7 +190,7 @@ stream->m_error = "File is incomplete."; return; } - toread = (input->size() > 0) ?input->size() :10000000; + toread = (input->size() > 0) ?(int32_t)input->size() :10000000; size = input->read(data, toread, toread); input->reset(0); if (size != input->size()) { @@ -249,7 +249,7 @@ sbatbIndex.push_back(currentDataBlock); currentDataBlock = nextBlock(currentDataBlock); } - maxsindex = sbatbIndex.size()*8; + maxsindex = (int32_t)sbatbIndex.size()*8; currentTableBlock = ptOffset; currentTableIndex = 0; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/pdf/pdfparser.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/pdf/pdfparser.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/pdf/pdfparser.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/pdf/pdfparser.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -33,8 +33,8 @@ StreamStatus PdfParser::read(int32_t min, int32_t max) { - int32_t off = pos-start; - int32_t d = stream->position() - objdefstart; + int32_t off = (int32_t)(pos-start); + int32_t d = (int32_t)(stream->position() - objdefstart); min += d; if (max > 0) max += d; stream->reset(objdefstart); @@ -183,13 +183,15 @@ StreamStatus n = skipDigits(); if (n != Ok) return n; if (pos < end && *pos == '.') { + // a '.' so this is a float pos++; n = skipDigits(); const char *s = start + p; lastNumber = strtod(s, 0); } else { + // no dot so this is a long const char *s = start + p; - lastNumber = strtol(s, 0, 10); + lastNumber = (double)strtol(s, 0, 10); } // parse a number lastObject = &lastNumber; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/processinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/processinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/processinputstream.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/processinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -91,7 +91,7 @@ fdin = -1; } else { // write into the pipe - int32_t m = write(fdin, b, n); + ssize_t m = write(fdin, b, n); if (m < 0) { m_error = strerror(errno); m_status = Error; @@ -117,16 +117,19 @@ close(fdout); fdout = 0; } - return n; + return (int32_t)n; } void ProcessInputStream::runCmd() { int p[2]; - pipe(p); + if (pipe(p) == -1) { + fprintf(stderr,"ProcessInputStream::runCmd: %s\n", strerror(errno)); + return; + } if( (pid=fork()) == -1) { /* something went wrong */ - fprintf(stderr,"ProcessInputStream::runCmd: fork error\n"); + fprintf(stderr,"ProcessInputStream::runCmd: %s\n", strerror(errno)); close (p[0]); close (p[1]); return; @@ -151,8 +154,10 @@ ProcessInputStream::runCmdWithInput() { int pin[2]; int pout[2]; - pipe(pin); - pipe(pout); + if (pipe(pin) == -1 || pipe(pout) == -1) { + fprintf(stderr,"ProcessInputStream::runCmd: %s\n", strerror(errno)); + return; + } if( (pid=fork()) == -1) { /* something went wrong */ diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/sdfinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/sdfinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/sdfinputstream.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/sdfinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -70,11 +70,11 @@ const char* nextLine = data; for (int i=0; i<4 && nextLine != 0; ++i) { thisLine = nextLine; - nextLine = skip80Line(thisLine, datasize - (thisLine - data)); + nextLine = skip80Line(thisLine, datasize - (int32_t)(thisLine - data)); } static const KmpSearcher searcher(label); if (nextLine != 0) { - nextLine = searcher.search(thisLine, nextLine - thisLine); + nextLine = searcher.search(thisLine, (int32_t)(nextLine - thisLine)); } return nextLine != 0; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/signatureinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/signatureinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/signatureinputstream.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/signatureinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -59,7 +59,7 @@ } int64_t SignatureInputStream::reset(int64_t newpos) { - int32_t r = p->input->reset(newpos); + int64_t r = p->input->reset(newpos); m_status = p->input->status(); m_position = p->input->position(); m_size = p->input->size(); @@ -67,7 +67,7 @@ } int64_t SignatureInputStream::skip(int64_t ntoskip) { - int32_t r = p->input->skip(ntoskip); + int64_t r = p->input->skip(ntoskip); m_status = p->input->status(); m_position = p->input->position(); m_size = p->input->size(); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/skippingbufferedstream.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/skippingbufferedstream.h --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/skippingbufferedstream.h 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/skippingbufferedstream.h 2009-12-08 23:40:30.000000000 +0000 @@ -183,7 +183,7 @@ assert(ntoskip >= 0); if (ntoskip == 0) return 0; if (buffer.avail > ntoskip) { - buffer.avail -= ntoskip; + buffer.avail -= (int32_t)ntoskip; buffer.readPos += ntoskip; StreamBase::m_position += ntoskip; return ntoskip; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/skippingfileinputstream2.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/skippingfileinputstream2.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/skippingfileinputstream2.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/skippingfileinputstream2.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -81,7 +81,7 @@ } // allocate memory in the buffer - int32_t bufsize = (m_size <= buffersize) ?m_size+1 :buffersize; + int32_t bufsize = (m_size <= buffersize) ?(int32_t)m_size+1 :buffersize; setMinBufSize(bufsize); } SkippingFileInputStream2::~SkippingFileInputStream2() { @@ -96,7 +96,7 @@ SkippingFileInputStream2::fillBuffer(char* start, int32_t space) { if (file == 0) return -1; // read into the buffer - int32_t nwritten = fread(start, 1, space, file); + int32_t nwritten = (int32_t)fread(start, 1, space, file); // check the file stream status if (ferror(file)) { m_error = "Could not read from file '" + filepath + "'."; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/skippingfileinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/skippingfileinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/skippingfileinputstream.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/skippingfileinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -94,7 +94,7 @@ if (n > buffersize) { buffer = (char*)realloc(buffer, n); } - int32_t nr = fread(buffer, 1, n, file); + int32_t nr = (int32_t)fread(buffer, 1, n, file); m_position = ftell(file); if (nr != n) { if (ferror(file)) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/streambuffer.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/streambuffer.h --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/streambuffer.h 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/streambuffer.h 2009-12-08 23:40:30.000000000 +0000 @@ -121,7 +121,7 @@ void StreamBuffer::setSize(int32_t size) { // store pointer information - int32_t offset = readPos - start; + int32_t offset = (int32_t)(readPos - start); // allocate memory in the buffer start = (T*)std::realloc(start, size*sizeof(T)); @@ -134,18 +134,18 @@ int32_t StreamBuffer::makeSpace(int32_t needed) { // determine how much space is available for writing - int32_t space = size - (readPos - start) - avail; + int32_t offset = (int32_t)(readPos - start); + int32_t space = size - offset - avail; if (space >= needed) { // there's enough space return space; } if (avail) { - if (readPos != start) { -// printf("moving\n"); + if (offset != 0) { // move data to the start of the buffer std::memmove(start, readPos, avail*sizeof(T)); - space += readPos - start; + space += offset; readPos = start; } } else { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/stringstream.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/stringstream.h --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/stringstream.h 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/stringstream.h 2009-12-08 23:40:30.000000000 +0000 @@ -111,7 +111,7 @@ return -1; } if (min < 0) min = 0; - int32_t nread = (int32_t)(max > left || max < 1) ?left :max; + int32_t nread = (max > left || max < 1) ?(int32_t)left :max; start = data + StreamBase::m_position; StreamBase::m_position += nread; if (StreamBase::m_position == StreamBase::m_size) { @@ -124,7 +124,7 @@ StringStream::skip(int64_t ntoskip) { if (ntoskip == 0) return 0; const T* start; - return read(start, ntoskip, ntoskip); + return read(start, (int32_t)ntoskip, (int32_t)ntoskip); } template int64_t diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/stringterminatedsubstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/stringterminatedsubstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/stringterminatedsubstream.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/stringterminatedsubstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -60,7 +60,7 @@ // check if we already read enough const int64_t pos = p->m_input->position(); - nread = p->furthest - pos; + nread = (int32_t)(p->furthest - pos); if (min <= nread) { if (max <= 0 || max > nread) { max = nread; @@ -103,7 +103,7 @@ const char* end = p->m_searcher.search(start, nread); if (end) { // the end signature was found - nread = end - start; + nread = (int32_t)(end - start); // signal the end of stream at the next call m_status = Eof; // set input stream to point after the terminator diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tarinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tarinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tarinputstream.cpp 2009-12-04 23:36:58.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tarinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -90,7 +90,7 @@ return; } - int32_t len = std::strlen(hb); + size_t len = std::strlen(hb); if (len == 0) { // ready m_status = Eof; @@ -119,7 +119,7 @@ m_entryinfo.mtime = readOctalField(hb, 136); if (m_status) return; - numPaddingBytes = 512 - m_entryinfo.size%512; + numPaddingBytes = (int32_t)(512 - m_entryinfo.size%512); if (numPaddingBytes == 512) { numPaddingBytes = 0; } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/CMakeLists.txt /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/CMakeLists.txt --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/CMakeLists.txt 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/CMakeLists.txt 2009-12-08 23:40:30.000000000 +0000 @@ -25,7 +25,7 @@ OleInputStreamTest.cpp RpmInputStreamTest.cpp SdfInputStreamTest.cpp - SignatureInputStreamTest.cpp +# SignatureInputStreamTest.cpp # disabled because that stream is not done SkippingFileInputStreamTest.cpp StringTerminatedSubStreamTest.cpp SubInputStreamTest.cpp @@ -55,4 +55,4 @@ ADD_TEST(${TName} testrunner-streams ${TName} ${strigi_SOURCE_DIR}/testdata/data) ENDFOREACH (test) -#endif(NOT WIN32) \ No newline at end of file +#endif(NOT WIN32) diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/inputstreamtests.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/inputstreamtests.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/inputstreamtests.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/inputstreamtests.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -50,7 +50,7 @@ size = s->size(); } else { // read past the end - n = s->read(ptr, size+1, size+1); + n = s->read(ptr, (int32_t)size+1, (int32_t)size+1); VERIFY(ptr); } VERIFY(size == n); @@ -79,7 +79,7 @@ inputStreamTest3(StreamBase* s) { // read beyond end, then reset, check status and try to skip so much again int64_t p = s->position(); - int32_t toread = s->size(); + int32_t toread = (int32_t)s->size(); toread = (toread > 0) ?toread+100 :1000000; const T* ptr; int64_t n = s->read(ptr, toread, 0); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/KmpSearcherTest.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/KmpSearcherTest.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/KmpSearcherTest.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/KmpSearcherTest.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -25,10 +25,11 @@ using namespace Strigi; +namespace { void testSearch(const KmpSearcher& searcher, const char* haystack, int32_t len, int32_t pos) { - if (len < 0) len = std::strlen(haystack); + if (len < 0) len = (int32_t)std::strlen(haystack); const char *p = searcher.search(haystack, len); if (pos < 0) { VERIFY(p==0); @@ -36,6 +37,7 @@ VERIFY(p-haystack==pos); } } +} int KmpSearcherTest(int argc, char* argv[]) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/SignatureInputStreamTest.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/SignatureInputStreamTest.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/SignatureInputStreamTest.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/SignatureInputStreamTest.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -48,7 +48,7 @@ // test on stream of known size with read for (uint32_t i=0; i 0) {} @@ -58,7 +58,7 @@ // test on stream of known size with skip for (uint32_t i=0; i 0) {} VERIFY(sig.signature() == s.substr(s.length()-i)); @@ -67,7 +67,7 @@ // test on stream of unknown size with read for (uint32_t i=0; i 0) {} diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/StringStreamTest.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/StringStreamTest.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/StringStreamTest.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/StringStreamTest.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -31,11 +31,11 @@ founderrors = 0; std::string s = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; for (int i=0; i s1(s.c_str(), s.length()); + StringStream s1(s.c_str(), (int32_t)s.length()); charinputstreamtests[i](&s1); } for (int i=0; i s1(s.c_str(), s.length()); + StringStream s1(s.c_str(), (int32_t)s.length()); UnknownSizeInputStream s2(&s1); charinputstreamtests[i](&s2); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/unknownsizestream.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/unknownsizestream.h --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/tests/unknownsizestream.h 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/tests/unknownsizestream.h 2009-12-08 23:40:30.000000000 +0000 @@ -53,7 +53,7 @@ * @brief inherited from StreamBase **/ int64_t reset(int64_t pos) { - int32_t r = input->reset(pos); + int64_t r = input->reset(pos); m_status = input->status(); m_position = input->position(); if (m_size == -1 && m_status == Eof) m_size = input->size(); @@ -63,7 +63,7 @@ * @brief inherited from StreamBase **/ int64_t skip(int64_t ntoskip) { - int32_t r = input->skip(ntoskip); + int64_t r = input->skip(ntoskip); m_status = input->status(); m_position = input->position(); if (m_size == -1 && m_status == Eof) m_size = input->size(); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/textutils.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/textutils.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/textutils.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/textutils.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -67,7 +67,7 @@ } bool Strigi::checkUtf8(const std::string& p) { - return checkUtf8(p.c_str(), p.size()); + return checkUtf8(p.c_str(), (int32_t)p.size()); } // http://www.w3.org/TR/REC-xml/#charsetsa @@ -125,7 +125,7 @@ } const char* Strigi::checkUtf8(const std::string& p, char& nb) { - return checkUtf8(p.c_str(), p.size(), nb); + return checkUtf8(p.c_str(), (int32_t)p.size(), nb); } /** @@ -133,8 +133,8 @@ **/ void Strigi::convertNewLines(char* p) { - int32_t len = std::strlen(p); - bool ok = checkUtf8(p, len); + size_t len = std::strlen(p); + bool ok = checkUtf8(p, (int32_t)len); if (!ok) fprintf(stderr, "string is not valid utf8\n"); const char* end = p+len; @@ -178,7 +178,7 @@ #ifdef __BIG_ENDIAN__ int16_t Strigi::readLittleEndianInt16(const char* c) { - return swap16(*reinterpret_cast(c)); + return (int16_t)swap16(*reinterpret_cast(c)); } uint16_t Strigi::readLittleEndianUInt16(const char* c) { @@ -203,11 +203,11 @@ #else int16_t Strigi::readBigEndianInt16(const char* c) { - return swap16(*reinterpret_cast(c)); + return (int16_t)swap16(*reinterpret_cast(c)); } uint16_t Strigi::readBigEndianUInt16(const char* c) { - return swap16(*reinterpret_cast(c)); + return (uint16_t)swap16(*reinterpret_cast(c)); } int32_t Strigi::readBigEndianInt32(const char* c) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/zipinputstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/zipinputstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/streams/zipinputstream.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/streams/zipinputstream.cpp 2009-12-08 23:40:30.000000000 +0000 @@ -239,7 +239,7 @@ // temporary hack for determining if this is a directory: // does the filename end in '/'? - len = m_entryinfo.filename.length(); + len = (int32_t)m_entryinfo.filename.length(); if (m_entryinfo.filename[len-1] == '/') { m_entryinfo.filename.resize(len-1); m_entryinfo.type = EntryInfo::Dir; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/strigicmd/strigicmd.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/strigicmd/strigicmd.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/strigicmd/strigicmd.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/strigicmd/strigicmd.cpp 2009-12-08 23:40:29.000000000 +0000 @@ -253,7 +253,7 @@ vector::iterator j; for (j = arguments.begin(); j != arguments.end(); ++j) { // remove trailinig '/' - int l = j->length(); + string::size_type l = j->length(); if (l > 0 && (*j)[l-1] == '/') { *j = j->substr(0,l-1); } @@ -427,7 +427,7 @@ for (vector::iterator iter = arguments.begin(); iter != arguments.end(); ++iter) { - unsigned int results = 0; + int results = 0; Query query = parser.buildQuery(*iter); const uint batchsize = 10; vector matches = reader->query(query, 0, batchsize); @@ -445,7 +445,7 @@ printIndexedDocument(*it); } - results += matches.size(); + results += (int)matches.size(); if (matches.size() == batchsize) { // maybe there're other results @@ -542,7 +542,7 @@ printIndexedDocument(*it); } - results += matches.size(); + results += (int)matches.size(); if (matches.size() == batchsize) { // maybe there're other results diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/cgixmlindexer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/cgixmlindexer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/cgixmlindexer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/cgixmlindexer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -94,9 +94,9 @@ "\n<" << mapping.map("metadata") << ">\n"; - long len; + int len; const char* lenstr = getenv("CONTENT_LENGTH"); - if (lenstr == NULL || sscanf(lenstr,"%ld", &len) != 1 || len < 0) { + if (lenstr == NULL || sscanf(lenstr,"%id", &len) != 1 || len < 0) { cout << " input too small\n\n" << flush; return 0; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/peranalyzerxml.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/peranalyzerxml.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/peranalyzerxml.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/peranalyzerxml.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -36,6 +36,7 @@ #include #include +#include #include #ifdef HAVE_UNISTD_H #include @@ -263,11 +264,14 @@ if (slashpos == string::npos) { analyzer.analyzeDir(targetFile); } else { - chdir(targetPath.substr(0,slashpos).c_str()); - analyzer.analyzeDir(targetPath.substr(slashpos+1).c_str()); + if (chdir(targetPath.substr(0,slashpos).c_str()) == -1) { + fprintf(stderr, "%s\n", strerror(errno)); + return -1; + } + analyzer.analyzeDir(targetPath.substr(slashpos+1).c_str()); } string str = out.str(); - int32_t n = 2*str.length(); + int32_t n = 2*(int32_t)str.length(); // if no reference file was specified, we output the analysis if (referenceFile == 0) { @@ -291,7 +295,7 @@ const char* p1 = c; const char* p2 = str.c_str(); int32_t n1 = n; - int32_t n2 = str.length(); + string::size_type n2 = str.length(); while (n1-- && n2-- && *p1 == *p2) { p1++; p2++; @@ -299,7 +303,7 @@ if (n1 ==0 && (*p1 || *p2)) { cout << "difference at position " << p1-c << endl; - int32_t m = (80 > str.length())?str.length():80; + int32_t m = (80 > str.length())?(int32_t)str.length():80; printf("%i %.*s\n", m, m, str.c_str()); m = (80 > n)?n:80; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/perfieldxml.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/perfieldxml.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/perfieldxml.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/perfieldxml.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -35,6 +35,7 @@ #include #include +#include #include #ifdef HAVE_UNISTD_H #include @@ -244,10 +245,13 @@ } return 1; } - chdir(argv[1]); + if (chdir(argv[1]) == -1) { + fprintf(stderr, "%s\n", strerror(errno)); + return -1; + } analyzer.analyzeDir(targetFile); string str = s.str(); - int32_t n = 2*str.length(); + int32_t n = 2*(int32_t)str.length(); // if no reference file was specified, we output the analysis if (referenceFile == 0) { @@ -272,7 +276,7 @@ const char* p1 = c; const char* p2 = str.c_str(); int32_t n1 = n; - int32_t n2 = str.length(); + string::size_type n2 = str.length(); while (n1-- && n2-- && *p1 == *p2) { p1++; p2++; @@ -280,7 +284,7 @@ if (n1 ==0 && (*p1 || *p2)) { cerr << "difference at position " << p1-c << endl; - int32_t m = (80 > str.length())?str.length():80; + int32_t m = (80 > str.length())?(int32_t)str.length():80; printf("%i %.*s\n", m, m, str.c_str()); m = (80 > n)?n:80; diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/rdfindexer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/rdfindexer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/rdfindexer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/rdfindexer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -87,7 +87,7 @@ return usage(argc, argv); } char* end; - nthreads = strtol(argv[i], &end, 10); + nthreads = (int)strtol(argv[i], &end, 10); if (end == argv[i] || nthreads < 1) { return usage(argc, argv); } @@ -129,7 +129,9 @@ if (dirs.size() == 0) { char buf[1024]; - getcwd(buf, 1023); + if (getcwd(buf, 1023) == NULL) { + return -1; + } dirs.push_back(buf); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/rdfindexwriter.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/rdfindexwriter.h --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/rdfindexwriter.h 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/rdfindexwriter.h 2009-12-08 23:40:32.000000000 +0000 @@ -140,7 +140,7 @@ std::string ov(value); p = ov.c_str(); end = p + ov.size(); - int newsize = value.size()+4*namp+3*(nlt+ngt)+5*napos+3*nexcept; + int newsize = (int)value.size()+4*namp+3*(nlt+ngt)+5*napos+3*nexcept; value.clear(); value.reserve(newsize); while (p < end) { @@ -203,7 +203,7 @@ STRIGI_MUTEX_LOCK(&mutex); Data* d = static_cast(ar->writerData()); const Strigi::AnalyzerConfiguration& config = ar->config(); - const Strigi::FieldRegister& fr = config.fieldRegister(); + //const Strigi::FieldRegister& fr = config.fieldRegister(); std::string v = ar->path(); escape(v); /* out << " <" << mapping.map("file") << " " << mapping.map("uri") diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/xmlindexer.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/xmlindexer.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/xmlindexer.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/xmlindexer.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -87,7 +87,7 @@ return usage(argc, argv); } char* end; - nthreads = strtol(argv[i], &end, 10); + nthreads = (int)strtol(argv[i], &end, 10); if (end == argv[i] || nthreads < 1) { return usage(argc, argv); } @@ -129,7 +129,9 @@ if (dirs.size() == 0) { char buf[1024]; - getcwd(buf, 1023); + if (getcwd(buf, 1023) == NULL) { + return -1; + } dirs.push_back(buf); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/xmlindexwriter.h /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/xmlindexwriter.h --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xmlindexer/xmlindexwriter.h 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xmlindexer/xmlindexwriter.h 2009-12-08 23:40:32.000000000 +0000 @@ -135,7 +135,7 @@ std::string ov(value); p = ov.c_str(); end = p + ov.size(); - int newsize = value.size()+4*namp+3*(nlt+ngt)+5*napos+3*nexcept; + int newsize = (int)value.size()+4*namp+3*(nlt+ngt)+5*napos+3*nexcept; value.clear(); value.reserve(newsize); while (p < end) { diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xsd/xsdparser/libxmlstream.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xsd/xsdparser/libxmlstream.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/src/xsd/xsdparser/libxmlstream.cpp 2009-12-04 23:36:57.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/src/xsd/xsdparser/libxmlstream.cpp 2009-12-08 23:40:29.000000000 +0000 @@ -48,7 +48,7 @@ SimpleNodeParser::parse(const string& xml, SimpleNode& node) { depth = 0; nodes.push(&node); - if (xmlSAXUserParseMemory(&handler, this, xml.c_str(), xml.length())) { + if (xmlSAXUserParseMemory(&handler, this, xml.c_str(), (int)xml.length())) { printf("parsing error: %s\n", ""); // handle the error unless it is a tag mismatch in html // errorstring = XML_ErrorString(e); diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/indextesters/indexmanagertester.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/indextesters/indexmanagertester.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/indextesters/indexmanagertester.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/indextesters/indexmanagertester.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -45,7 +45,8 @@ Strigi::IndexPluginLoader::deleteIndexManager(m_manager); // clean up data (if any) string cmd("rm -rf '" + m_indexpath + "'"); - system(cmd.c_str()); + int r = system(cmd.c_str()); + CPPUNIT_ASSERT_MESSAGE("cleanup failed", r == 0); } void diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/indextesters/indexsearchtester.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/indextesters/indexsearchtester.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/indextesters/indexsearchtester.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/indextesters/indexsearchtester.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -111,7 +111,8 @@ IndexSearchTest::tearDown() { // clean up data (does not work on windows) string cmd = "rm -r '" + filedir + "'"; - system(cmd.c_str()); + int r = system(cmd.c_str()); + CPPUNIT_ASSERT_MESSAGE ("command failed", r == 0); IndexTest::tearDown(); } @@ -136,7 +137,7 @@ Strigi::Query query = parser.buildQuery("fileName:'testfile01'"); vector matches = m_reader->query(query, 0, 10); - int nhits = matches.size(); + int nhits = (int)matches.size(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of hits is wrong.", 1, nhits); } @@ -147,7 +148,7 @@ Strigi::Query query = parser.buildQuery( Strigi::FieldRegister::pathFieldName+":'unindexed'"); vector matches = m_reader->query(query, 0, 10); - int nhits = matches.size(); + int nhits = (int)matches.size(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of hits is wrong.", 0, nhits); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/indextesters/indextest.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/indextesters/indextest.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/indextesters/indextest.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/indextesters/indextest.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -51,5 +51,6 @@ IndexPluginLoader::deleteIndexManager(m_manager); // clean up data (if any) string cmd("rm -rf '" + m_indexpath + "'"); - system(cmd.c_str()); + int r = system(cmd.c_str()); + CPPUNIT_ASSERT_MESSAGE("cleanup failed", r == 0); } diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/indextesters/indexwritertester.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/indextesters/indexwritertester.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/indextesters/indexwritertester.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/indextesters/indexwritertester.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -54,7 +54,7 @@ { Strigi::AnalysisResult result( path, 1, *m_writer, *m_streamAnalyzer ); std::string text( "Some dummy text for testing." ); - m_writer->addText( &result, text.c_str(), text.length() ); + m_writer->addText( &result, text.c_str(), (int32_t)text.length() ); } m_writer->commit(); // at this point the new document is most likely not yet visible diff -Nru /tmp/YrOe5suq2V/kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/streamanalyzer/diranalyzertester.cpp /tmp/yxIvGfCzfl/kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/streamanalyzer/diranalyzertester.cpp --- kde-nightly-kdesupport-20091204+svn1058683/strigi/tests/streamanalyzer/diranalyzertester.cpp 2009-12-04 23:36:59.000000000 +0000 +++ kde-nightly-kdesupport-20091208+svn1060445/strigi/tests/streamanalyzer/diranalyzertester.cpp 2009-12-08 23:40:32.000000000 +0000 @@ -116,7 +116,8 @@ cmd += indexdir; cmd += " "; cmd += filedir; - system(cmd.c_str()); + int r = system(cmd.c_str()); + CPPUNIT_ASSERT_MESSAGE("cleanup failed", r == 0); } void DirAnalyzerTester::testVariables()