[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/amarok
From: Casey Link <unnamedrambler () gmail ! com>
Date: 2009-01-21 22:20:00
Message-ID: 1232576400.337015.14831.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 914864 by link:
Commit patches submitted by Adriaan de Groot <groot@kde.org>. Fixes
compilation issues on OpenSolaris.
M +4 -0 cmake/modules/FindMySQLAmarok.cmake
M +1 -1 src/ActionClasses.cpp
M +6 -1 src/Debug.h
M +14 -14 src/collection/daap/daapreader/authentication/md5.c
M +3 -3 src/collection/daap/daapreader/authentication/md5.h
M +1 -1 src/context/plasma/private/toolbox.cpp
M +1 -1 src/context/popupdropper/libpud/PopupDropperItem.cpp
M +1 -1 src/meta/Meta.h
M +2 -1 src/metadata/rmff/rmff.cpp
M +1 -1 src/playlistmanager/PlaylistManager.cpp
M +1 -1 src/scriptengine/generator/generator/asttoxml.cpp
M +1 -1 src/scriptengine/generator/generator/asttoxml.h
M +1 -1 src/scriptengine/generator/generator/generator.h
--- trunk/extragear/multimedia/amarok/cmake/modules/FindMySQLAmarok.cmake \
#914863:914864 @@ -17,6 +17,8 @@
~/usr/include/mysql
/opt/local/include/mysql5/mysql
/opt/mysqle/include/mysql
+ /opt/mysql/mysql/include
+ /usr/mysql/include/mysql
/usr/include/mysql
/usr/local/include/mysql
/opt/local/include/mysql
@@ -25,6 +27,8 @@
find_library(MYSQL_LIBRARIES NAMES mysqlclient
PATHS
~/usr/lib/mysql
+ /opt/mysql/mysql/lib
+ /usr/mysql/lib/mysql
/opt/local/lib/mysql5/mysql
/opt/mysqle/lib/mysql
/usr/lib/mysql
--- trunk/extragear/multimedia/amarok/src/ActionClasses.cpp #914863:914864
@@ -29,6 +29,7 @@
#include <KToolBar>
+extern KAboutData aboutData;
namespace Amarok
{
@@ -142,7 +143,6 @@
KMenu*
Menu::helpMenu( QWidget *parent ) //STATIC
{
- extern KAboutData aboutData;
if ( s_helpMenu == 0 )
s_helpMenu = new KHelpMenu( parent, &aboutData, Amarok::actionCollection() \
);
--- trunk/extragear/multimedia/amarok/src/Debug.h #914863:914864
@@ -32,8 +32,9 @@
#include <QMutex>
#include <QObject>
+#include <sys/time.h>
+#include <unistd.h>
#include <iostream>
-#include <sys/time.h>
#include <cerrno>
#include "amarok_export.h"
@@ -161,6 +162,10 @@
/// Announce a line
#define DEBUG_LINE_INFO { Debug::mutex.lock(); kDebug() << Debug::indent() << "Line: \
" << __LINE__; Debug::mutex.unlock(); }
+#ifdef __SUNPRO_CC
+#define __PRETTY_FUNCTION__ __FILE__
+#endif
+
/// Convenience macro for making a standard Debug::Block
#define DEBUG_BLOCK Debug::Block uniquelyNamedStackAllocatedStandardBlock( \
__PRETTY_FUNCTION__ );
--- trunk/extragear/multimedia/amarok/src/collection/daap/daapreader/authentication/md5.c \
#914863:914864 @@ -44,7 +44,7 @@
* on buffers full of bytes, and then call OpenDaap_MD5Final, which will fill
* a supplied 16-byte array with the digest.
*/
-static void MD5Transform(u_int32_t buf[4], u_int32_t const in[16], int apple_ver);
+static void MD5Transform(uint32_t buf[4], uint32_t const in[16], int apple_ver);
/* for some reason we still have to reverse bytes on bigendian machines
* I don't really know why... but otherwise it fails..
* Any MD5 gurus out there know why???
@@ -60,11 +60,11 @@
*/
static void byteReverse(unsigned char *buf, unsigned longs)
{
- u_int32_t t;
+ uint32_t t;
do {
- t = (u_int32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+ t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
((unsigned) buf[1] << 8 | buf[0]);
- *(u_int32_t *) buf = t;
+ *(uint32_t *) buf = t;
buf += 4;
} while (--longs);
}
@@ -88,12 +88,12 @@
void OpenDaap_MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned int len)
{
- u_int32_t t;
+ uint32_t t;
/* Update bitcount */
t = ctx->bits[0];
- if ((ctx->bits[0] = t + ((u_int32_t) len << 3)) < t)
+ if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t)
ctx->bits[1]++; /* Carry from low to high */
ctx->bits[1] += len >> 29;
@@ -111,7 +111,7 @@
}
memcpy(p, buf, t);
byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (u_int32_t *) ctx->in, ctx->apple_ver);
+ MD5Transform(ctx->buf, (uint32_t *) ctx->in, ctx->apple_ver);
buf += t;
len -= t;
}
@@ -120,7 +120,7 @@
while (len >= 64) {
memcpy(ctx->in, buf, 64);
byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (u_int32_t *) ctx->in, ctx->apple_ver);
+ MD5Transform(ctx->buf, (uint32_t *) ctx->in, ctx->apple_ver);
buf += 64;
len -= 64;
}
@@ -152,7 +152,7 @@
/* Two lots of padding: Pad the first block to 64 bytes */
memset(p, 0, count);
byteReverse(ctx->in, 16);
- MD5Transform(ctx->buf, (u_int32_t *) ctx->in, ctx->apple_ver);
+ MD5Transform(ctx->buf, (uint32_t *) ctx->in, ctx->apple_ver);
/* Now fill the next block with 56 bytes */
memset(ctx->in, 0, 56);
@@ -163,10 +163,10 @@
byteReverse(ctx->in, 14);
/* Append length in bits and transform */
- ((u_int32_t *) ctx->in)[14] = ctx->bits[0];
- ((u_int32_t *) ctx->in)[15] = ctx->bits[1];
+ ((uint32_t *) ctx->in)[14] = ctx->bits[0];
+ ((uint32_t *) ctx->in)[15] = ctx->bits[1];
- MD5Transform(ctx->buf, (u_int32_t *) ctx->in, ctx->apple_ver);
+ MD5Transform(ctx->buf, (uint32_t *) ctx->in, ctx->apple_ver);
byteReverse((unsigned char *) ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
@@ -191,9 +191,9 @@
* the addition of 16 longwords of new data. OpenDaap_MD5Update blocks the
* data and converts bytes into longwords for this routine.
*/
-static void MD5Transform(u_int32_t buf[4], u_int32_t const in[16], int apple_ver)
+static void MD5Transform(uint32_t buf[4], uint32_t const in[16], int apple_ver)
{
- u_int32_t a, b, c, d;
+ uint32_t a, b, c, d;
a = buf[0];
b = buf[1];
--- trunk/extragear/multimedia/amarok/src/collection/daap/daapreader/authentication/md5.h \
#914863:914864 @@ -17,12 +17,12 @@
#ifndef __MD5_H__
#define __MD5_H__
-
+#include <inttypes.h>
#include "portability.h"
typedef struct {
- u_int32_t buf[4];
- u_int32_t bits[2];
+ uint32_t buf[4];
+ uint32_t bits[2];
unsigned char in[64];
int apple_ver;
} MD5_CTX;
--- trunk/extragear/multimedia/amarok/src/context/plasma/private/toolbox.cpp \
#914863:914864 @@ -160,7 +160,7 @@
d->showing = show;
}
-void ToolBox::setCorner(const Corner corner)
+void ToolBox::setCorner(Corner corner)
{
d->corner = corner;
}
--- trunk/extragear/multimedia/amarok/src/context/popupdropper/libpud/PopupDropperItem.cpp \
#914863:914864 @@ -177,7 +177,7 @@
return d->hoverIndicatorShowStyle;
}
-void PopupDropperItem::setHoverIndicatorShowStyle( const HoverIndicatorShowStyle \
hover ) +void PopupDropperItem::setHoverIndicatorShowStyle( HoverIndicatorShowStyle \
hover ) {
d->hoverIndicatorShowStyle = hover;
if( !d->hoveredOver )
--- trunk/extragear/multimedia/amarok/src/meta/Meta.h #914863:914864
@@ -271,7 +271,7 @@
virtual bool operator==( const Track &track ) const;
- static bool lessThan( TrackPtr left, TrackPtr right );
+ static bool lessThan( const TrackPtr left, const TrackPtr right );
protected:
virtual void notifyObservers() const;
--- trunk/extragear/multimedia/amarok/src/metadata/rmff/rmff.cpp #914863:914864
@@ -33,6 +33,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include <stdlib.h>
#include <netinet/in.h>
#include <taglib.h>
#include <id3v1tag.h>
@@ -209,7 +210,7 @@
RealMediaFF::~RealMediaFF()
{
- ::free(m_filename);
+ free(m_filename);
Collectable *hdr = m_head, *next;
while (hdr)
--- trunk/extragear/multimedia/amarok/src/playlistmanager/PlaylistManager.cpp \
#914863:914864 @@ -183,7 +183,7 @@
}
void
-PlaylistManager::downloadPlaylist( const KUrl & path, Meta::PlaylistPtr playlist )
+PlaylistManager::downloadPlaylist( const KUrl & path, const Meta::PlaylistPtr \
playlist ) {
DEBUG_BLOCK
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/asttoxml.cpp \
#914863:914864 @@ -32,7 +32,7 @@
#include <QTextCodec>
#include <QFile>
-void astToXML(QString name) {
+void astToXML(const QString &name) {
QFile file(name);
if (!file.open(QFile::ReadOnly))
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/asttoxml.h \
#914863:914864 @@ -30,7 +30,7 @@
#include <QString>
#include <QXmlStreamWriter>
-void astToXML(const QString name);
+void astToXML(const QString &name);
void writeOutNamespace(QXmlStreamWriter &s, NamespaceModelItem &item);
void writeOutEnum(QXmlStreamWriter &s, EnumModelItem &item);
void writeOutFunction(QXmlStreamWriter &s, FunctionModelItem &item);
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/generator.h \
#914863:914864 @@ -36,7 +36,7 @@
{
Q_OBJECT
- Q_PROPERTY(QString outputDirectory READ outputDirectory WRITE \
setOutputDirectory); + Q_PROPERTY(QString outputDirectory READ outputDirectory \
WRITE setOutputDirectory)
public:
enum Option {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic