rsibreak/gcc-45.diff

23 lines
894 B
Diff
Raw Normal View History

--- src/rsitimer.cpp.sav 2009-07-19 15:35:42.000000000 +0200
+++ src/rsitimer.cpp 2010-02-15 15:43:33.921351095 +0100
@@ -490,7 +490,7 @@ void RSITimer::readConfig()
m_ignoreIdleForTinyBreaks = config.readEntry( "IgnoreIdleForTinyBreaks", false );
config = KGlobal::config()->group( "General" );
- m_lastrunDt = config.readEntry( "LastRunTimeStamp", QDateTime::QDateTime() );
+ m_lastrunDt = config.readEntry( "LastRunTimeStamp", QDateTime() );
m_lastrunTiny = config.readEntry( "LastRunTinyLeft", 0 );
m_lastrunBig = config.readEntry( "LastRunBigLeft", 0 );
}
--- src/CMakeLists.txt.sav 2009-07-19 15:35:42.000000000 +0200
+++ src/CMakeLists.txt 2010-02-15 15:42:29.005358277 +0100
@@ -49,7 +49,7 @@ breakcontrol.cpp
QT4_ADD_DBUS_ADAPTOR( rsibreak_sources
org.rsibreak.rsiwidget.xml
-rsiwidget.h RSIObject::RSIObject
+rsiwidget.h RSIObject
)
# compilation