Hello community,
here is the log from the commit of package kdetoys4 for openSUSE:Factory
checked in at Tue Nov 23 00:28:28 CET 2010.
--------
--- KDE/kdetoys4/kdetoys4.changes 2010-10-28 22:14:09.000000000 +0200
+++ kdetoys4/kdetoys4.changes 2010-11-19 17:19:55.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Nov 19 17:19:53 CET 2010 - dmueller@suse.de
+
+- update to 4.5.80
+ * KDE 4.6 Beta1
+ * no upstream changelog available.
+
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdetoys-4.5.3.tar.bz2
New:
----
kdetoys-4.5.80.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdetoys4.spec ++++++
--- /var/tmp/diff_new_pack.vEpldm/_old 2010-11-23 00:27:11.000000000 +0100
+++ /var/tmp/diff_new_pack.vEpldm/_new 2010-11-23 00:27:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdetoys4 (Version 4.5.3)
+# spec file for package kdetoys4 (Version 4.5.80)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,7 +23,7 @@
Group: System/GUI/KDE
Summary: Kdetoys Base Package
Url: http://www.kde.org
-Version: 4.5.3
+Version: 4.5.80
Release: 1
Source0: kdetoys-%version.tar.bz2
Patch: 4_5_BRANCH.diff
++++++ kdetoys-4.5.3.tar.bz2 -> kdetoys-4.5.80.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/CMakeLists.txt new/kdetoys-4.5.80/CMakeLists.txt
--- old/kdetoys-4.5.3/CMakeLists.txt 2010-03-30 10:27:51.000000000 +0200
+++ new/kdetoys-4.5.80/CMakeLists.txt 2010-09-27 21:49:28.000000000 +0200
@@ -7,7 +7,10 @@
include( KDE4Defaults )
include( MacroLibrary )
-add_definitions( ${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
+add_definitions( ${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
+add_definitions( -DQT_NO_CAST_FROM_ASCII )
+add_definitions( -DQT_NO_CAST_TO_ASCII )
+
include_directories( ${KDE4_INCLUDES} )
# The FindKDE4.cmake module sets _KDE4_PLATFORM_DEFINITIONS with
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/data/nekokurorc new/kdetoys-4.5.80/amor/data/nekokurorc
--- old/kdetoys-4.5.3/amor/data/nekokurorc 2010-09-30 23:22:57.000000000 +0200
+++ new/kdetoys-4.5.80/amor/data/nekokurorc 2010-08-19 10:51:20.000000000 +0200
@@ -13,17 +13,12 @@
Description[cs]=Neko Kuro
Description[da]=Neko Kuro
Description[de]=Neko Kuro
-Description[el]=Neko Kuro
Description[en_GB]=Neko Kuro
Description[es]=Neko Kuro
Description[et]=Neko Kuro
Description[eu]=Neko Kuro
-Description[fr]=Neko Kuro
-Description[ga]=Neko Kuro
Description[hr]=Neko Kuro
-Description[hu]=Neko Kuro
Description[is]=Neko Kuro
-Description[it]=Neko Kuro
Description[km]=Neko Kuro
Description[ko]=검은 고양이
Description[nb]=Neko Kuro
@@ -51,17 +46,12 @@
About[cs]=Grafika z programu oneko, Masayuki Koba\nAMOR'd: Chris Spiegel\nKuro (černé): Bill Kendrick
About[da]=Grafik fra oneko af Masayuki Koba\nAMOR'd af Chris Spiegel\nKuro (sort) version af Bill Kendrick
About[de]=Zeichnungen der Katze (oneko) von Masayuki Koba\nAuf AMOR portiert von Chris Spiegel\nKuro-Version (schwarze Katze) von Bill Kendrick
-About[el]=Καλλιτεχνική εργασία από το oneko από τον Masayuki Koba\nAMOR'd και από τον Chris Spiegel\ nKuro (Black) έκδοση από τον Bill Kendrick
About[en_GB]=Artwork from oneko by Masayuki Koba\nAMOR'd by Chris Spiegel\nKuro (Black) version by Bill Kendrick
About[es]=Arte de oneko por Masayuki Koba\nAMORizado por Chris Spiegel\nVersión Kuro (Negro) por Bill Kendrick
About[et]=Oneko graafika: Masayuki Koba\nAMORile kohandas: Chris Spiegel\nKuro (must) versioon: Bill Kendrick
About[eu]=Onekoren artelana Masayuki Koba-k\nChris Spiegel'ek AMOR'tua\nKuro bertsioa (Beltza) Bill Kendrick-ek
-About[fr]=Travail utilisant « oneko » de Masayuki Koba\nAMORé par Chris Spiegel\nVersion Kuro (noir) par Bill Kendrick
-About[ga]=Maisiúchán ó oneko le Masayuki Koba\nCurtha i AMOR ag Chris Spiegel\nLeagan Kuro (Dubh) le Bill Kendrick
About[hr]=Umjetnički rad je preuzet od oneko, autor Masayuki Koba\nAMOR'd, autor Chris Spiegel\nKuro (crna) verzija, autor Bill Kendrick
-About[hu]=A grafika Masuyaki Koba Onekojából származik\nAMOR-átirat: Chris Spiegel\nA Kuro (Black) verzió készítője Bill Kendrick
About[is]=Myndskreyting úr oneko eftir Masayuki Koba\nAMOR-erað af Chris Spiegel\nKuro (Black) útgáfan eftir Bill Kendrick
-About[it]=I disegni provengono da Oneko, di Masayuki Koba.\nConvertito ad AMOR da Chris Spiegel\nVersione Kuro (nero) di Bill Kendrick.
About[km]=សិល្បៈពី oneko ដោយ Masayuki Koba\nAMOR'd ដោយ Chris Spiegel\nKuro (Black) កំណែដោយ Bill Kendrick
About[ko]=Masayuki Koba의 oneko 그림에서 따 옴\nChris Spiegel이 AMOR로 작성\nBill Kendrick이 검은 고양이로 개조
About[nb]=Kunstnerisk arbeide fra oneko av Masayuki Koba\nTilpasset AMOR av Chris Spiegel\nKuro (Svart) versjon av Bill Kendrick
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/CMakeLists.txt new/kdetoys-4.5.80/amor/src/CMakeLists.txt
--- old/kdetoys-4.5.3/amor/src/CMakeLists.txt 2010-02-20 12:31:22.000000000 +0100
+++ new/kdetoys-4.5.80/amor/src/CMakeLists.txt 2010-10-27 21:54:38.000000000 +0200
@@ -20,6 +20,6 @@
install( TARGETS amor ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install( FILES amor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS amor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES org.kde.amor.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/amor.cpp new/kdetoys-4.5.80/amor/src/amor.cpp
--- old/kdetoys-4.5.3/amor/src/amor.cpp 2010-04-22 10:03:59.000000000 +0200
+++ new/kdetoys-4.5.80/amor/src/amor.cpp 2010-09-27 21:49:28.000000000 +0200
@@ -79,7 +79,7 @@
mForceHideAmorWidget( false )
{
new AmorAdaptor( this );
- QDBusConnection::sessionBus().registerObject( "/Amor", this );
+ QDBusConnection::sessionBus().registerObject( QLatin1String( "/Amor" ), this );
if( !readConfig() ) {
qApp->quit();
@@ -128,14 +128,14 @@
mTimer->start( 0 );
}
- if( !QDBusConnection::sessionBus().connect( QString(), QString(), "org.kde.amor",
- "KDE_stop_screensaver", this, SLOT( screenSaverStopped() ) ) )
+ if( !QDBusConnection::sessionBus().connect( QString(), QString(), QLatin1String( "org.kde.amor" ),
+ QLatin1String( "KDE_stop_screensaver" ), this, SLOT( screenSaverStopped() ) ) )
{
kDebug(10000) << "Could not attach DBus signal: KDE_stop_screensaver()";
}
- if( !QDBusConnection::sessionBus().connect( QString(), QString(), "org.kde.amor",
- "KDE_start_screensaver", this, SLOT( screenSaverStarted() ) ) )
+ if( !QDBusConnection::sessionBus().connect( QString(), QString(), QLatin1String( "org.kde.amor" ),
+ QLatin1String( "KDE_start_screensaver" ), this, SLOT( screenSaverStarted() ) ) )
{
kDebug(10000) << "Could not attach DBus signal: KDE_start_screensaver()";
}
@@ -233,7 +233,7 @@
mConfig.read();
if( mConfig.mTips ) {
- mTips.setFile( TIPS_FILE );
+ mTips.setFile(QLatin1String( TIPS_FILE ) );
}
// Select a random theme if user requested it
@@ -241,7 +241,7 @@
QStringList files;
// Store relative paths into files to avoid storing absolute pathnames.
- KGlobal::dirs()->findAllResources( "appdata", "*rc", KStandardDirs::NoSearchOptions, files );
+ KGlobal::dirs()->findAllResources( "appdata", QLatin1String( "*rc" ), KStandardDirs::NoSearchOptions, files );
int randomTheme = KRandom::random() % files.count();
mConfig.mTheme = files.at( randomTheme );
}
@@ -257,21 +257,21 @@
// Read all the standard animation groups
for(int i = 0; groups[i]; ++i) {
- if( !mTheme.readGroup( groups[i] ) ) {
- KMessageBox::error( 0, i18nc( "@info:status", "Error reading group: " ) + groups[i] );
+ if( !mTheme.readGroup(QLatin1String( groups[i] ) ) ) {
+ KMessageBox::error( 0, i18nc( "@info:status", "Error reading group: " ) + QLatin1String( groups[i] ) );
return false;
}
}
}
else {
- if( !mTheme.readGroup( ANIM_BASE ) ) {
- KMessageBox::error( 0, i18nc( "@info:status", "Error reading group: " ) + ANIM_BASE );
+ if( !mTheme.readGroup(QLatin1String( ANIM_BASE ) ) ) {
+ KMessageBox::error( 0, i18nc( "@info:status", "Error reading group: " ) + QLatin1String( ANIM_BASE ) );
return false;
}
}
// Get the base animation
- mBaseAnim = mTheme.random( ANIM_BASE );
+ mBaseAnim = mTheme.random(QLatin1String( ANIM_BASE ) );
return true;
}
@@ -327,13 +327,13 @@
switch( state ) {
case Blur:
hideBubble();
- mCurrAnim = mTheme.random( ANIM_BLUR );
+ mCurrAnim = mTheme.random(QLatin1String( ANIM_BLUR ) );
mState = Focus;
break;
case Focus:
hideBubble();
- mCurrAnim = mTheme.random( ANIM_FOCUS );
+ mCurrAnim = mTheme.random(QLatin1String( ANIM_FOCUS ) );
if( oldAnim != mCurrAnim ) {
mCurrAnim->reset();
}
@@ -403,16 +403,16 @@
case Destroy:
hideBubble();
- mCurrAnim = mTheme.random( ANIM_DESTROY );
+ mCurrAnim = mTheme.random(QLatin1String( ANIM_DESTROY ) );
mState = Focus;
break;
case Sleeping:
- mCurrAnim = mTheme.random( ANIM_SLEEP );
+ mCurrAnim = mTheme.random(QLatin1String( ANIM_SLEEP ) );
break;
case Waking:
- mCurrAnim = mTheme.random( ANIM_WAKE );
+ mCurrAnim = mTheme.random(QLatin1String( ANIM_WAKE ) );
mState = Normal;
break;
@@ -421,7 +421,7 @@
// is not the base, otherwise select the base. This makes us
// alternate between the base animation and a random animination.
if( !mBubble && mCurrAnim == mBaseAnim ) {
- mCurrAnim = mTheme.random( ANIM_NORMAL );
+ mCurrAnim = mTheme.random(QLatin1String( ANIM_NORMAL ) );
}
else {
mCurrAnim = mBaseAnim;
@@ -502,15 +502,15 @@
#ifdef __GNUC__
#warning the following is kinda dirty and should be done by KHelpMenu::menu() I think. (hermier)
#endif
- helpMenu->setIcon( SmallIcon( "help-contents" ) );
+ helpMenu->setIcon( SmallIcon( QLatin1String( "help-contents" ) ) );
helpMenu->setTitle( i18nc( "@action:inmenu Amor", "&Help" ) );
mMenu = new KMenu( 0 );
- mMenu->addTitle( "Amor" ); // I really don't want this i18n'ed
- mMenu->addAction( SmallIcon( "configure" ), i18nc( "@action:inmenu Amor", "&Configure..." ), this, SLOT( slotConfigure() ) );
+ mMenu->addTitle( QLatin1String( "Amor" ) ); // I really don't want this i18n'ed
+ mMenu->addAction( SmallIcon( QLatin1String ("configure" ) ), i18nc( "@action:inmenu Amor", "&Configure..." ), this, SLOT( slotConfigure() ) );
mMenu->addSeparator();
mMenu->addMenu( helpMenu );
- mMenu->addAction( SmallIcon( "application-exit" ), i18nc( "@action:inmenu Amor", "&Quit" ), kapp, SLOT( quit() ) );
+ mMenu->addAction( SmallIcon( QLatin1String( "application-exit" ) ), i18nc( "@action:inmenu Amor", "&Quit" ), kapp, SLOT( quit() ) );
}
mMenu->exec( pos );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/amorconfig.cpp new/kdetoys-4.5.80/amor/src/amorconfig.cpp
--- old/kdetoys-4.5.3/amor/src/amorconfig.cpp 2010-04-22 10:03:59.000000000 +0200
+++ new/kdetoys-4.5.80/amor/src/amorconfig.cpp 2010-09-27 21:49:28.000000000 +0200
@@ -23,7 +23,7 @@
AmorConfig::AmorConfig()
- : mTheme( "blobrc" ),
+ : mTheme(QLatin1String( "blobrc" ) ),
mOnTop( false ),
mOffset( 0 ),
mTips( false ),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/amordialog.cpp new/kdetoys-4.5.80/amor/src/amordialog.cpp
--- old/kdetoys-4.5.3/amor/src/amordialog.cpp 2010-02-20 12:31:22.000000000 +0100
+++ new/kdetoys-4.5.80/amor/src/amordialog.cpp 2010-09-27 21:49:28.000000000 +0200
@@ -108,7 +108,7 @@
// Non-recursive search for theme files, with the relative paths stored
// in files so that absolute paths are not used.
- KGlobal::dirs()->findAllResources( "appdata", "*rc", KStandardDirs::NoSearchOptions, files );
+ KGlobal::dirs()->findAllResources( "appdata", QLatin1String( "*rc" ), KStandardDirs::NoSearchOptions, files );
for(QStringList::ConstIterator it = files.constBegin(); it != files.constEnd(); ++it) {
addTheme( *it );
@@ -126,8 +126,8 @@
return;
}
- pixmapPath += '/';
- if( pixmapPath[0] != '/' ) {
+ pixmapPath += QLatin1Char( '/' );
+ if( pixmapPath[0] != QLatin1Char( '/' ) ) {
// relative to config file. We add a / to indicate the dir
pixmapPath = KStandardDirs::locate("appdata", pixmapPath);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/amorpixmapmanager.cpp new/kdetoys-4.5.80/amor/src/amorpixmapmanager.cpp
--- old/kdetoys-4.5.3/amor/src/amorpixmapmanager.cpp 2010-03-30 10:27:51.000000000 +0200
+++ new/kdetoys-4.5.80/amor/src/amorpixmapmanager.cpp 2010-09-27 21:49:28.000000000 +0200
@@ -24,7 +24,7 @@
AmorPixmapManager::AmorPixmapManager()
- : mPixmapDir(".")
+ : mPixmapDir(QLatin1String( "." ))
{
}
@@ -43,7 +43,7 @@
void AmorPixmapManager::reset()
{
- mPixmapDir = '.';
+ mPixmapDir = QLatin1Char( '.' );
mPixmaps.clear();
}
@@ -55,7 +55,7 @@
if( !pixmap ) {
// pixmap has not yet been loaded.
- QString path = mPixmapDir + QString( "/" ) + img;
+ QString path = mPixmapDir + QLatin1String( "/" ) + img;
pixmap = new QPixmap( path );
if( !pixmap->isNull() ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/amorthememanager.cpp new/kdetoys-4.5.80/amor/src/amorthememanager.cpp
--- old/kdetoys-4.5.3/amor/src/amorthememanager.cpp 2010-04-22 10:03:59.000000000 +0200
+++ new/kdetoys-4.5.80/amor/src/amorthememanager.cpp 2010-09-27 21:49:28.000000000 +0200
@@ -54,11 +54,11 @@
return false;
}
- if( pixmapPath[0] == '/' ) {
+ if( pixmapPath[0] == QLatin1Char( '/' ) ) {
mPath = pixmapPath; // absolute path to pixmaps
}
else {
- mPath.truncate( mPath.lastIndexOf( '/' ) + 1 ); // relative to config file
+ mPath.truncate( mPath.lastIndexOf( QLatin1Char( '/' ) ) + 1 ); // relative to config file
mPath += pixmapPath;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/amortips.cpp new/kdetoys-4.5.80/amor/src/amortips.cpp
--- old/kdetoys-4.5.3/amor/src/amortips.cpp 2010-02-20 12:31:22.000000000 +0100
+++ new/kdetoys-4.5.80/amor/src/amortips.cpp 2010-09-27 21:49:28.000000000 +0200
@@ -31,7 +31,7 @@
AmorTips::AmorTips()
{
- KGlobal::locale()->insertCatalog( "ktip" ); // For ktip tip translations
+ KGlobal::locale()->insertCatalog( QLatin1String( "ktip" ) ); // For ktip tip translations
}
@@ -68,7 +68,7 @@
{
QString fname;
- fname = KStandardDirs::locate("data", QString("kdewizard/tips"));
+ fname = KStandardDirs::locate("data", QLatin1String("kdewizard/tips"));
if( fname.isEmpty() ) {
return false;
@@ -77,20 +77,20 @@
QFile f( fname );
if( f.open( QIODevice::ReadOnly ) ) {
// Reading of tips must be exactly as in KTipDatabase::loadTips for translation
- QString content = f.readAll();
- const QRegExp rx( "\\n+" );
+ QString content =QLatin1String( f.readAll() );
+ const QRegExp rx( QLatin1String( "\\n+" ) );
int pos = -1;
- while( ( pos = content.indexOf( "<html>", pos + 1, Qt::CaseInsensitive ) ) != -1 ) {
+ while( ( pos = content.indexOf( QLatin1String( "<html>" ), pos + 1, Qt::CaseInsensitive ) ) != -1 ) {
QString tip = content
- .mid( pos + 6, content.indexOf("</html>", pos, Qt::CaseInsensitive) - pos - 6 )
- .replace( rx, "\n" );
+ .mid( pos + 6, content.indexOf(QLatin1String( "</html>" ), pos, Qt::CaseInsensitive) - pos - 6 )
+ .replace( rx, QLatin1String( "\n" ) );
- if( !tip.endsWith('\n') ) {
- tip += '\n';
+ if( !tip.endsWith(QLatin1Char( '\n' )) ) {
+ tip += QLatin1Char( '\n' );
}
- if( tip.startsWith( '\n' ) ) {
+ if( tip.startsWith( QLatin1Char( '\n' ) ) ) {
tip = tip.mid( 1 );
}
@@ -138,7 +138,7 @@
}
if( !tip.isEmpty() ) {
- if( tip[ tip.length()-1 ] == '\n' ) {
+ if( tip[ tip.length()-1 ] == QLatin1Char( '\n' ) ) {
tip.truncate( tip.length()-1 );
}
mTips.append( tip );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/main.cpp new/kdetoys-4.5.80/amor/src/main.cpp
--- old/kdetoys-4.5.3/amor/src/main.cpp 2010-04-22 10:03:59.000000000 +0200
+++ new/kdetoys-4.5.80/amor/src/main.cpp 2010-11-19 11:50:39.000000000 +0100
@@ -34,15 +34,33 @@
int main(int argc, char *argv[])
{
- QApplication::setGraphicsSystem( "native" );
+ QApplication::setGraphicsSystem( QLatin1String( "native" ) );
KAboutData about( "amor", 0, ki18n( "amor" ), AMOR_VERSION );
about.setLicense( KAboutData::License_GPL );
about.setShortDescription( ki18n( description ) );
- about.setCopyrightStatement( ki18n( "Copyright 1999, Martin R. Jones" ) );
- about.addAuthor( ki18n("Martin R. Jones"), KLocalizedString(), "mjones@kde.org" );
- about.addAuthor( ki18n( "Gerardo Puga" ), KLocalizedString(), "gpuga@gioia.ing.unlp.edu.ar" );
- about.addAuthor( ki18n( "Stefan Böhmann" ), ki18n("Current maintainer"), "kde@hilefoks.org" );
+ about.setCopyrightStatement( ki18n( "1999 by Martin R. Jones\n2010 by Stefan Böhmann" ) );
+
+ about.addAuthor(
+ ki18n( "Stefan Böhmann" ),
+ ki18n( "Current maintainer" ),
+ "kde@hilefoks.org",
+ "http://www.hilefoks.org",
+ "hilefoks"
+ );
+
+ about.addAuthor(
+ ki18n("Martin R. Jones"),
+ KLocalizedString(),
+ "mjones@kde.org"
+ );
+
+ about.addAuthor(
+ ki18n( "Gerardo Puga" ),
+ KLocalizedString(),
+ "gpuga@gioia.ing.unlp.edu.ar"
+ );
+
KCmdLineArgs::init( argc, argv, &about );
if( !KUniqueApplication::start() ) {
@@ -54,7 +72,7 @@
AmorSessionWidget *sessionWidget = new AmorSessionWidget; // session management
app.setTopWidget( sessionWidget );
- QDBusConnection::sessionBus().registerObject( "/Amor",new Amor() );
+ QDBusConnection::sessionBus().registerObject( QLatin1String( "/Amor" ),new Amor() );
return app.exec();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/amor/src/queueitem.cpp new/kdetoys-4.5.80/amor/src/queueitem.cpp
--- old/kdetoys-4.5.3/amor/src/queueitem.cpp 2010-02-20 12:31:22.000000000 +0100
+++ new/kdetoys-4.5.80/amor/src/queueitem.cpp 2010-09-27 21:49:28.000000000 +0200
@@ -31,10 +31,10 @@
// discard html code from the length count
for(int i = 0; i < m_text.length(); ++i) {
- if( m_text[i] == '<' ) {
+ if( m_text[i] == QLatin1Char( '<' ) ) {
nesting++;
}
- else if( m_text[i] == '>' ) {
+ else if( m_text[i] == QLatin1Char( '>' ) ) {
nesting--;
}
else if( !nesting ) {
Files old/kdetoys-4.5.3/doc/amor/index.cache.bz2 and new/kdetoys-4.5.80/doc/amor/index.cache.bz2 differ
Files old/kdetoys-4.5.3/doc/kteatime/index.cache.bz2 and new/kdetoys-4.5.80/doc/kteatime/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/kteatime/src/CMakeLists.txt new/kdetoys-4.5.80/kteatime/src/CMakeLists.txt
--- old/kdetoys-4.5.3/kteatime/src/CMakeLists.txt 2009-01-06 18:19:27.000000000 +0100
+++ new/kdetoys-4.5.80/kteatime/src/CMakeLists.txt 2010-10-27 21:54:36.000000000 +0200
@@ -6,5 +6,5 @@
target_link_libraries(kteatime ${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KDEUI_LIBS})
install( TARGETS kteatime ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install( FILES kteatime.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS kteatime.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kteatime.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kteatime )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/kteatime/src/kteatime.desktop new/kdetoys-4.5.80/kteatime/src/kteatime.desktop
--- old/kdetoys-4.5.3/kteatime/src/kteatime.desktop 2010-08-27 10:12:56.000000000 +0200
+++ new/kdetoys-4.5.80/kteatime/src/kteatime.desktop 2010-10-05 13:38:18.000000000 +0200
@@ -128,4 +128,4 @@
X-DocPath=kteatime/index.html
X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
-Categories=Qt;KDE;Game;Amusement;
+Categories=Qt;KDE;Utility;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/kteatime/src/kteatime.notifyrc new/kdetoys-4.5.80/kteatime/src/kteatime.notifyrc
--- old/kdetoys-4.5.3/kteatime/src/kteatime.notifyrc 2010-09-30 23:22:57.000000000 +0200
+++ new/kdetoys-4.5.80/kteatime/src/kteatime.notifyrc 2010-08-19 10:51:20.000000000 +0200
@@ -7,24 +7,19 @@
Comment[cs]=Vařič čaje
Comment[da]=Tekoger
Comment[de]=Teekocher
-Comment[el]=Εργαλείο παρασκευής τσαγιού
Comment[en_GB]=Tea Cooker
Comment[es]=Tetera
Comment[et]=Teekann
Comment[eu]=Te prestaketa
-Comment[fr]=Théière
-Comment[ga]=Cócaire Tae
Comment[hr]=Pomoćnik pri kuhanju čaja
Comment[hu]=Teafőző
Comment[is]=Teketillinn
-Comment[it]=Teiera
Comment[km]=ចង្ក្រានតែ
Comment[ko]=차 끓이기
Comment[nb]=Tekoker
Comment[nds]=Teekaker
Comment[nl]=Theezetter
Comment[nn]=Tekokar
-Comment[pa]=ਚਾਹ ਕੁੱਕਰ
Comment[pt]=Cozinheiro de Chá
Comment[pt_BR]=Hora do chá
Comment[ru]=Приготовление чая
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/kteatime/src/main.cpp new/kdetoys-4.5.80/kteatime/src/main.cpp
--- old/kdetoys-4.5.3/kteatime/src/main.cpp 2010-05-05 16:51:11.000000000 +0200
+++ new/kdetoys-4.5.80/kteatime/src/main.cpp 2010-11-19 11:50:39.000000000 +0100
@@ -25,7 +25,7 @@
int main (int argc, char *argv[])
{
- KAboutData aboutData( "kteatime", 0, ki18n( "KTeaTime" ), "1.2.1",
+ KAboutData aboutData( "kteatime", 0, ki18n( "KTeaTime" ), "1.2.2",
ki18n( "KDE utility for making a fine cup of tea." ),
KAboutData::License_GPL,
ki18n( "(c) 1998-1999, Matthias Hoelzer-Kluepfel\n "
@@ -34,10 +34,31 @@
)
);
- aboutData.addAuthor( ki18n( "Matthias Hoelzer-Kluepfel" ), KLocalizedString(), "hoelzer@kde.org");
- aboutData.addAuthor( ki18n( "Martin Willers" ), KLocalizedString(), "willers@xm-arts.de");
- aboutData.addAuthor( ki18n( "Stefan Böhmann" ), KLocalizedString(), "kde@hilefoks.org");
- aboutData.addCredit( ki18n( "Daniel Teske" ), ki18n( "Many patches" ), "teske@bigfoot.com");
+ aboutData.addAuthor(
+ ki18n( "Stefan Böhmann" ),
+ ki18n( "Current maintainer" ),
+ "kde@hilefoks.org",
+ "http://www.hilefoks.org",
+ "hilefoks"
+ );
+
+ aboutData.addAuthor(
+ ki18n( "Matthias Hoelzer-Kluepfel" ),
+ KLocalizedString(),
+ "hoelzer@kde.org"
+ );
+
+ aboutData.addAuthor(
+ ki18n( "Martin Willers" ),
+ KLocalizedString(),
+ "willers@xm-arts.de"
+ );
+
+ aboutData.addCredit(
+ ki18n( "Daniel Teske" ),
+ ki18n( "Many patches" ),
+ "teske@bigfoot.com"
+ );
KCmdLineArgs::init( argc, argv, &aboutData );
@@ -45,7 +66,7 @@
options.add( "t" );
options.add( "time <seconds>", ki18n( "Start a new tea with this time." ) );
options.add( "n");
- options.add( "name <name>", ki18n( "Use this name for the tea started with %1." ).subs( "--time" ) );
+ options.add( "name <name>", ki18n( "Use this name for the tea started with %1." ).subs( QLatin1String("--time") ) );
KCmdLineArgs::addCmdLineOptions( options );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/kteatime/src/settings.cpp new/kdetoys-4.5.80/kteatime/src/settings.cpp
--- old/kdetoys-4.5.3/kteatime/src/settings.cpp 2010-04-22 10:03:58.000000000 +0200
+++ new/kdetoys-4.5.80/kteatime/src/settings.cpp 2010-09-27 21:49:24.000000000 +0200
@@ -51,9 +51,9 @@
setButtons( Ok | Cancel | Help | Reset );
setButtonText( KDialog::Reset, i18n( "Configure &Notifications..." ) );
setButtonToolTip( KDialog::Reset, i18n( "Configure notifications" ) );
- setButtonIcon( KDialog::Reset, KIcon( "preferences-desktop-notification" ) );
+ setButtonIcon( KDialog::Reset, KIcon( QLatin1String( "preferences-desktop-notification" ) ) );
- setHelp( "configure" );
+ setHelp( QLatin1String("configure") );
setButtonWhatsThis( KDialog::Ok, i18n( "Save changes and close dialog." ) );
setButtonWhatsThis( KDialog::Cancel, i18n( "Close dialog without saving changes." ) );
@@ -107,10 +107,10 @@
ui->upButton->setEnabled( false );
ui->downButton->setEnabled( false );
- ui->newButton->setIcon( KIcon( "list-add" ) );
- ui->removeButton->setIcon( KIcon( "edit-delete" ) );
- ui->upButton->setIcon( KIcon( "arrow-up" ) );
- ui->downButton->setIcon( KIcon( "arrow-down" ) );
+ ui->newButton->setIcon( KIcon( QLatin1String( "list-add" ) ) );
+ ui->removeButton->setIcon( KIcon( QLatin1String( "edit-delete" ) ) );
+ ui->upButton->setIcon( KIcon( QLatin1String( "arrow-up" ) ) );
+ ui->downButton->setIcon( KIcon( QLatin1String( "arrow-down" ) ) );
connect( ui->popupCheckBox, SIGNAL( toggled(bool) ), this, SLOT( checkPopupButtonState(bool) ) );
connect( this, SIGNAL( resetClicked() ), this, SLOT( confButtonClicked() ) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/kteatime/src/tea.cpp new/kdetoys-4.5.80/kteatime/src/tea.cpp
--- old/kdetoys-4.5.3/kteatime/src/tea.cpp 2010-04-22 10:03:58.000000000 +0200
+++ new/kdetoys-4.5.80/kteatime/src/tea.cpp 2010-09-27 21:49:24.000000000 +0200
@@ -82,7 +82,7 @@
if( (time % year) / day ) {
if( !str.isEmpty() ) {
- str.append( ' ' );
+ str.append( QLatin1Char( ' ' ) );
}
if( longdesc ) {
@@ -95,7 +95,7 @@
if( (time % day) / hour ) {
if( !str.isEmpty() ) {
- str.append( ' ' );
+ str.append( QLatin1Char( ' ' ) );
}
if( longdesc ) {
@@ -108,7 +108,7 @@
if( (time % hour) / min ) {
if( !str.isEmpty() ) {
- str.append( ' ' );
+ str.append( QLatin1Char( ' ' ) );
}
if( longdesc ) {
@@ -121,7 +121,7 @@
if( time % min ) {
if( !str.isEmpty() ) {
- str.append( ' ' );
+ str.append( QLatin1Char( ' ' ) );
}
if( longdesc ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdetoys-4.5.3/kteatime/src/toplevel.cpp new/kdetoys-4.5.80/kteatime/src/toplevel.cpp
--- old/kdetoys-4.5.3/kteatime/src/toplevel.cpp 2010-05-05 16:51:11.000000000 +0200
+++ new/kdetoys-4.5.80/kteatime/src/toplevel.cpp 2010-09-27 21:49:24.000000000 +0200
@@ -67,19 +67,19 @@
m_teaActionGroup=new QActionGroup( this );
// build the context menu
- m_stopAct = new QAction( "stop", this );
- m_stopAct->setIcon( KIcon( "edit-delete" ) );
+ m_stopAct = new QAction( QLatin1String( "stop" ), this );
+ m_stopAct->setIcon( KIcon( QLatin1String( "edit-delete" ) ) );
m_stopAct->setText( i18n( "&Stop" ) );
m_stopAct->setEnabled( false );
- m_confAct = new QAction( "configure", this );
- m_confAct->setIcon(KIcon( "configure" ) );
+ m_confAct = new QAction( QLatin1String( "configure" ), this );
+ m_confAct->setIcon(KIcon( QLatin1String( "configure" ) ) );
m_confAct->setText(i18n( "&Configure..." ) );
- m_anonAct = new QAction( "anonymous", this );
+ m_anonAct = new QAction( QLatin1String( "anonymous" ), this );
m_anonAct->setText(i18n( "&Anonymous..." ) );
- m_exitAct = actionCollection()->action(KStandardAction::name( KStandardAction::Quit ) );
+ m_exitAct = actionCollection()->action( QLatin1String( KStandardAction::name( KStandardAction::Quit ) ));
m_exitAct->setShortcut( 0 ); // Not sure if it is correct.
m_helpMenu = new KHelpMenu( 0, aboutData, false );
@@ -144,8 +144,8 @@
KConfigGroup tealistGroup( config, "Tealist" );
for(int i=0; i