From be1a164c881f31bcf7af60263b131c9217a20d91 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 31 Aug 2011 04:15:04 +0000 Subject: [PATCH] Fix remaining instances of tqStatus embedded in user visible strings git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1250385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kvirc/kernel/kvi_options.cpp | 2 +- src/kvirc/sparser/kvi_numeric.h | 2 +- src/modules/dcc/libkvidcc.cpp | 2 +- src/modules/mediaplayer/mp_amarokinterface.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index d0d6db9..2d3c1e2 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -787,7 +787,7 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= MSGTYPE_OPTION("SSL",__tr_no_lookup("SSL message"),KVI_SMALLICON_SSL,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("Search",__tr_no_lookup("Search"),KVI_SMALLICON_SEARCH,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("GenericSuccess",__tr_no_lookup("Generic success"),KVI_SMALLICON_CYANSQUARE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("GenerictqStatus",__tr_no_lookup("Generic status"),KVI_SMALLICON_GREENSQUARE,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("GenericStatus",__tr_no_lookup("Generic status"),KVI_SMALLICON_GREENSQUARE,KVI_MSGTYPE_LEVEL_2), MSGTYPE_OPTION("GenericVerbose",__tr_no_lookup("Generic verbose message"),KVI_SMALLICON_DKGREENSQUARE,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("GenericWarning",__tr_no_lookup("Generic warning"),KVI_SMALLICON_YELLOWSQUARE,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION_SPEC("GenericError",__tr_no_lookup("Generic error"),KVI_SMALLICON_REDSQUARE,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_5), diff --git a/src/kvirc/sparser/kvi_numeric.h b/src/kvirc/sparser/kvi_numeric.h index 08c9fcc..0e05775 100644 --- a/src/kvirc/sparser/kvi_numeric.h +++ b/src/kvirc/sparser/kvi_numeric.h @@ -385,7 +385,7 @@ ///* 342 */ RPL_SUMMONING, "%s :User summoned to irc", ///* 352 */ RPL_WHOREPLY, , ///* 361 */ RPL_KILLDONE, (char *)NULL, -///* 362 */ RPL_CLOSING, "%s :Closed. tqStatus = %d", +///* 362 */ RPL_CLOSING, "%s :Closed. Status = %d", ///* 363 */ RPL_CLOSEEND, "%d: Connections Closed", ///* 364 */ RPL_LINKS, "%s %s :%d %s", ///* 365 */ RPL_ENDOFLINKS, "%s :End of /LINKS list.", diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index 93274b4..ce6949f 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -2708,7 +2708,7 @@ static bool dcc_module_init(KviModule * m) // FIXME: file upload / download state ? - KVSM_REGISTER_FUNCTION(m,"transfertqStatus",dcc_kvs_fnc_transfertqStatus); + KVSM_REGISTER_FUNCTION(m,"transferStatus",dcc_kvs_fnc_transfertqStatus); KVSM_REGISTER_FUNCTION(m,"protocol",dcc_kvs_fnc_protocol); KVSM_REGISTER_FUNCTION(m,"connectionType",dcc_kvs_fnc_connectionType); KVSM_REGISTER_FUNCTION(m,"isFileTransfer",dcc_kvs_fnc_isFileTransfer); diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp index 6cb20e2..699bc74 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.cpp +++ b/src/modules/mediaplayer/mp_amarokinterface.cpp @@ -122,14 +122,14 @@ int KviAmarokInterface::position() bool KviAmarokInterface::getRepeat() { bool ret; - if(!boolRetVoidDCOPCall("player","repeatTracktqStatus()",ret))return false; + if(!boolRetVoidDCOPCall("player","repeatTrackStatus()",ret))return false; return ret; } bool KviAmarokInterface::getShuffle() { bool ret; - if(!boolRetVoidDCOPCall("player","randomModetqStatus()",ret))return false; + if(!boolRetVoidDCOPCall("player","randomModeStatus()",ret))return false; return ret; }