You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
3.0 KiB
66 lines
3.0 KiB
6 years ago
|
diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
|
||
|
index 4a34ae2f..ecec66d4 100644
|
||
|
--- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
|
||
|
+++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
|
||
|
@@ -106,7 +106,7 @@ bool ChatNavServiceTask::take( Transfer* transfer )
|
||
|
void ChatNavServiceTask::onGo()
|
||
|
{
|
||
|
FLAP f = { 0x02, 0, 0x00 };
|
||
|
- SNAC s = { 0x000D, m_type, 0x0000, client()->snacSequence() };
|
||
|
+ SNAC s = { 0x000D, (unsigned short)m_type, 0x0000, client()->snacSequence() };
|
||
|
Buffer* b = new Buffer();
|
||
|
|
||
|
Transfer* t = createTransfer( f, s, b );
|
||
|
diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
|
||
|
index af180be1..0f9c8f5f 100644
|
||
|
--- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
|
||
|
+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
|
||
|
@@ -60,7 +60,7 @@ void SendMessageTask::onGo()
|
||
|
snacSubfamily = 0x000B;
|
||
|
}
|
||
|
FLAP f = { 0x02, 0, 0 };
|
||
|
- SNAC s = { 0x0004, snacSubfamily, 0x0000, client()->snacSequence() };
|
||
|
+ SNAC s = { 0x0004, (unsigned short)snacSubfamily, 0x0000, client()->snacSequence() };
|
||
|
Buffer* b = new Buffer();
|
||
|
|
||
|
if ( snacSubfamily == 0x0006 )
|
||
|
diff --git a/lanbrowsing/lisa/main.cpp b/lanbrowsing/lisa/main.cpp
|
||
|
index fd96d04e..1ef55453 100644
|
||
|
--- a/lanbrowsing/lisa/main.cpp
|
||
|
+++ b/lanbrowsing/lisa/main.cpp
|
||
|
@@ -53,7 +53,7 @@
|
||
|
void printVersion()
|
||
|
{
|
||
|
const char * versionInfo=\
|
||
|
- "\r\nThis is the LAN Information Server LISa "MYVERSION"\r\n"\
|
||
|
+ "\r\nThis is the LAN Information Server LISa " MYVERSION "\r\n"\
|
||
|
"It is free software according the GNU General Public License\r\n"\
|
||
|
"Copyright (c) 2000-2003 by Alexander Neundorf\r\n"\
|
||
|
"email: neundorf@kde.org\r\n";
|
||
|
diff --git a/lanbrowsing/lisa/netmanager.cpp b/lanbrowsing/lisa/netmanager.cpp
|
||
|
index 5a21fe5c..cf6a2f76 100644
|
||
|
--- a/lanbrowsing/lisa/netmanager.cpp
|
||
|
+++ b/lanbrowsing/lisa/netmanager.cpp
|
||
|
@@ -1033,7 +1033,7 @@ void NetManager::getListFromServerServer( int address)
|
||
|
|
||
|
void NetManager::printState()
|
||
|
{
|
||
|
- std::cerr<<"LAN Information Server Lisa "MYVERSION"\nAlexander Neundorf <neundorf@kde.org>\n";
|
||
|
+ std::cerr<<"LAN Information Server Lisa " MYVERSION "\nAlexander Neundorf <neundorf@kde.org>\n";
|
||
|
std::cerr<<"Reading options from config file: "<<m_usedConfigFileName<<std::endl;
|
||
|
std::cerr<<"StrictMode: "<<m_strictMode<<std::endl;
|
||
|
std::cerr<<"ServerServer: "<<m_serverServer<<std::endl;
|
||
|
diff --git a/lanbrowsing/lisa/strictmain.cpp b/lanbrowsing/lisa/strictmain.cpp
|
||
|
index 07f5b9bc..09f3eda0 100644
|
||
|
--- a/lanbrowsing/lisa/strictmain.cpp
|
||
|
+++ b/lanbrowsing/lisa/strictmain.cpp
|
||
|
@@ -52,7 +52,7 @@
|
||
|
void printVersion()
|
||
|
{
|
||
|
const char * versionInfo=\
|
||
|
- "\r\nThis is the restricted LAN Information Server resLISa "MYVERSION"\r\n"\
|
||
|
+ "\r\nThis is the restricted LAN Information Server resLISa " MYVERSION "\r\n"\
|
||
|
"It is free software according the GNU General Public License\r\n"\
|
||
|
"Copyright (c) 2000-2003 by Alexander Neundorf\r\n"\
|
||
|
"email: neundorf@kde.org\r\n";
|