summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arts/runtime/artsbuilderloader_impl.cc2
m---------cmake0
-rw-r--r--kscd/libwm/database.c8
-rw-r--r--tdefile-plugins/mp3/tdefile_mp3.cpp6
4 files changed, 7 insertions, 9 deletions
diff --git a/arts/runtime/artsbuilderloader_impl.cc b/arts/runtime/artsbuilderloader_impl.cc
index ee00941..238daae 100644
--- a/arts/runtime/artsbuilderloader_impl.cc
+++ b/arts/runtime/artsbuilderloader_impl.cc
@@ -247,7 +247,7 @@ public:
if( stat(filename.c_str(), &st) == 0 )
{
char mtime[32];
- sprintf(mtime,"[%ld]",st.st_mtime);
+ snprintf(mtime,sizeof(mtime),"[%.0f]",difftime(st.st_mtime, (time_t)0));
result += filename + mtime;
}
else
diff --git a/cmake b/cmake
-Subproject 74654feb3bd49ba97c57e83ba2dd23c7c3d83c0
+Subproject 5121b9a41d671dbaf7350c349d246793d8d8a4e
diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c
index 62d66a3..d9b17d7 100644
--- a/kscd/libwm/database.c
+++ b/kscd/libwm/database.c
@@ -1107,11 +1107,11 @@ load( void )
/* This is some kind of profiling code. I don't change it
to wm_lib_message() for now... */
#ifndef NDEBUG
- long t1, t2;
+ time_t t1, t2;
if( getenv( "WORKMAN_DEBUG" ) != NULL )
{
time(&t1);
- printf("%s (%d): search start = %ld\n", __FILE__, __LINE__, t1);
+ printf("%s (%d): search start = %.0f\n", __FILE__, __LINE__, difftime(t1, (time_t)0));
fflush(stdout);
}
#endif
@@ -1158,7 +1158,7 @@ load( void )
if( getenv( "WORKMAN_DEBUG" ) != NULL )
{
time(&t2);
- printf("%s (%d): db search end = %ld, elapsed = %ld\n", __FILE__, __LINE__, t2, t2 - t1);
+ printf("%s (%d): db search end = %.0f, elapsed = %.0f\n", __FILE__, __LINE__, difftime(t2, (time_t)0), difftime(t2, t1));
fflush(stdout);
}
#endif
@@ -1192,7 +1192,7 @@ load( void )
if( getenv( "WORKMAN_DEBUG" ) != NULL )
{
time(&t2);
- printf("%s (%d): search end = %ld, elapsed = %ld\n", __FILE__, __LINE__, t2, t2 - t1);
+ printf("%s (%d): search end = %.0f, elapsed = %.0f\n", __FILE__, __LINE__, difftime(t2, (time_t)0), difftime(t2, t1));
fflush(stdout);
}
#endif
diff --git a/tdefile-plugins/mp3/tdefile_mp3.cpp b/tdefile-plugins/mp3/tdefile_mp3.cpp
index 2d0e002..041e031 100644
--- a/tdefile-plugins/mp3/tdefile_mp3.cpp
+++ b/tdefile-plugins/mp3/tdefile_mp3.cpp
@@ -191,8 +191,6 @@ bool KMp3Plugin::readInfo(KFileMetaInfo &info, uint what)
break;
}
- static const int dummy = 0; // TQVariant's bool constructor requires a dummy int value.
-
// CRC and Emphasis aren't yet implemented in TagLib (not that I think anyone cares)
appendItem(techgroup, "Version", version);
@@ -201,8 +199,8 @@ bool KMp3Plugin::readInfo(KFileMetaInfo &info, uint what)
appendItem(techgroup, "Bitrate", file.audioProperties()->bitrate());
appendItem(techgroup, "Sample Rate", file.audioProperties()->sampleRate());
appendItem(techgroup, "Channels", file.audioProperties()->channels());
- appendItem(techgroup, "Copyright", TQVariant(file.audioProperties()->isCopyrighted(), dummy));
- appendItem(techgroup, "Original", TQVariant(file.audioProperties()->isOriginal(), dummy));
+ appendItem(techgroup, "Copyright", TQVariant(file.audioProperties()->isCopyrighted()));
+ appendItem(techgroup, "Original", TQVariant(file.audioProperties()->isOriginal()));
appendItem(techgroup, "Length", file.audioProperties()->length());
// appendItem(techgroup, "Emphasis", file.audioProperties()->empahsis());
}