diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/help/index.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mp3.cpp | 16 | ||||
| -rw-r--r-- | src/modules/options/optw_messages.cpp | 3 | ||||
| -rw-r--r-- | src/modules/options/optw_sound.cpp | 1 | ||||
| -rw-r--r-- | src/modules/perlcore/ppport.h | 14 | ||||
| -rw-r--r-- | src/modules/setup/setupwizard.cpp | 3 | ||||
| -rw-r--r-- | src/modules/torrent/tc_ktorrentdcopinterface.cpp | 14 |
7 files changed, 29 insertions, 24 deletions
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 82c5f575..2d6dbf09 100644 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -134,7 +134,7 @@ void Index::setupDocumentList() void Index::insertInDict( const TQString &str, int docNum ) { - if ( strcmp( str, "amp" ) == 0 || strcmp( str, "nbsp" ) == 0 ) + if ( str == "amp" || str == "nbsp" ) return; Entry *e = 0; if ( dict.count() ) diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp index 4942ee50..8000a9a4 100644 --- a/src/modules/mediaplayer/mp_mp3.cpp +++ b/src/modules/mediaplayer/mp_mp3.cpp @@ -396,7 +396,9 @@ int get_id3(mp3info *mp3) { retcode |= 4; } else { - fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; + // silence warning about ignoring return value of fread + [[maybe_unused]] size_t _unused = 0; + _unused = fread(fbuf,1,3,mp3->file); fbuf[3] = '\0'; mp3->id3.genre[0]=255; if(!strcmp((const char *)"TAG",(const char *)fbuf)) @@ -404,16 +406,16 @@ int get_id3(mp3info *mp3) mp3->id3_isvalid=1; mp3->datasize -= 128; fseek(mp3->file, -125, SEEK_END); - fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0'; - fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0'; - fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0'; - fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0'; - fread(mp3->id3.comment,1,30,mp3->file); mp3->id3.comment[30] = '\0'; + _unused = fread(mp3->id3.title,1,30,mp3->file); mp3->id3.title[30] = '\0'; + _unused = fread(mp3->id3.artist,1,30,mp3->file); mp3->id3.artist[30] = '\0'; + _unused = fread(mp3->id3.album,1,30,mp3->file); mp3->id3.album[30] = '\0'; + _unused = fread(mp3->id3.year,1,4,mp3->file); mp3->id3.year[4] = '\0'; + _unused = fread(mp3->id3.comment,1,30,mp3->file); mp3->id3.comment[30] = '\0'; if(mp3->id3.comment[28] == '\0') { mp3->id3.track[0] = mp3->id3.comment[29]; } - fread(mp3->id3.genre,1,1,mp3->file); + _unused = fread(mp3->id3.genre,1,1,mp3->file); unpad(mp3->id3.title); unpad(mp3->id3.artist); unpad(mp3->id3.album); diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index a9af812d..9eabcce6 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -614,7 +614,8 @@ void KviMessageColorsOptionsWidget::load() //tqDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr()); //tqDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr())); //tqDebug("ERRNO (%d)",errno); - symlink(szGlobal,szLocal); + // "int _ = " used to silence warning from compiler about unchecked returned values + int _ = symlink(szGlobal,szLocal); // FIXME: Do it also on windows... #endif diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index a9d8db6e..1e0df2b9 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -30,6 +30,7 @@ #include "kvi_modulemanager.h" #include "kvi_pointerlist.h" #include "kvi_string.h" +#include "kvi_tal_tooltip.h" #include <tqlabel.h> #include <tqpushbutton.h> diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h index 8c8a706d..f9deb946 100644 --- a/src/modules/perlcore/ppport.h +++ b/src/modules/perlcore/ppport.h @@ -217,14 +217,16 @@ __DATA__ /* Replace: 0 */ #endif -#ifdef HASATTRIBUTE -# if defined(__GNUC__) && defined(__cplusplus) -# define PERL_UNUSED_DECL +#ifndef PERL_UNUSED_DECL +# ifdef HASATTRIBUTE +# if defined(__GNUC__) && defined(__cplusplus) +# define PERL_UNUSED_DECL +# else +# define PERL_UNUSED_DECL __attribute__((unused)) +# endif # else -# define PERL_UNUSED_DECL __attribute__((unused)) +# define PERL_UNUSED_DECL # endif -#else -# define PERL_UNUSED_DECL #endif #ifndef dNOOP diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 3cf36461..844e0b93 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -1001,7 +1001,8 @@ void KviSetupWizard::accept() // Make local->global link TQString localPath = TQString("%1/global").arg(g_pApp->m_szLocalKvircDir); unlink(TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); - symlink(TQTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); + // "int _ = " used to silence warning from compiler about unchecked returned values + int _ = symlink(TQTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),TQTextCodec::codecForLocale()->fromUnicode(localPath).data()); #endif #ifdef COMPILE_TDE_SUPPORT diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index 4d5c72d9..a26074ce 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -25,16 +25,14 @@ // //============================================================================= -#ifdef COMPILE_TDE_SUPPORT - -#include "kvi_app.h" +#include "kvi_settings.h" - -#include "dcopclient.h" // <-- this include should be hidden in kvilib +#ifdef COMPILE_TDE_SUPPORT #include "tc_ktorrentdcopinterface.h" +#include "dcopclient.h" // <-- this include should be hidden in kvilib - +#include "kvi_app.h" #include "kvi_locale.h" #include <tqtimer.h> @@ -58,8 +56,8 @@ TORR_IMPLEMENT_DESCRIPTOR( tqDebug("%s (%s:%d): %s", __PRETTY_FUNCTION__, __FILE__, __LINE__, (const char*)msg); \ #define ERROR_MSG_RANGE(I, SIZE) \ - KviTQString::sprintf(m_lastError, __tr2qs_ctx("Index out of range: %d [0-%d]!", "torrent"), I, (SIZE>0)?(SIZE-1):0); \ - tqDebug("%s (%s:%d): Index out of range: %d [0-%d]!", __PRETTY_FUNCTION__ , __FILE__, __LINE__, I, (SIZE>0)?(SIZE-1):0); + KviTQString::sprintf(m_lastError, __tr2qs_ctx("Index out of range: %d [0-%ld]!", "torrent"), I, (SIZE>0)?(SIZE-1):0); \ + tqDebug("%s (%s:%d): Index out of range: %d [0-%ld]!", __PRETTY_FUNCTION__ , __FILE__, __LINE__, I, (SIZE>0)?(SIZE-1):0); #define ERROR_RET_BOOL \ { \ |
