Swiftdiff options
| author | Pavol Babincak <scroolik@gmail.com> | 2012-04-23 22:09:01 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-04-24 18:04:58 (GMT) |
| commit | fd990d0154feb63e00b7506b63530376a8bc9f01 (patch) | |
| tree | d815d8541105374f6320c48aeac52cf0af6e8baa | |
| parent | 5cf6ef99404a08c0e9d2ed4f6df79375fda11d4a (diff) | |
| download | swift-fd990d0154feb63e00b7506b63530376a8bc9f01.zip swift-fd990d0154feb63e00b7506b63530376a8bc9f01.tar.bz2 | |
Debug messages print only if logging is enabled
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 8 | ||||
| -rw-r--r-- | Swift/Controllers/FileTransfer/FileTransferController.cpp | 5 | ||||
| -rw-r--r-- | Swift/QtUI/QtChatWindow.cpp | 9 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index 5602dcd..4352c8b 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -248,7 +248,7 @@ void ChatController::handleNewFileTransferController(FileTransferController* ftc } void ChatController::handleFileTransferCancel(std::string id) { - std::cout << "handleFileTransferCancel(" << id << ")" << std::endl; + SWIFT_LOG(debug) << "handleFileTransferCancel(" << id << ")" << std::endl; if (ftControllers.find(id) != ftControllers.end()) { ftControllers[id]->cancel(); } else { @@ -257,7 +257,7 @@ void ChatController::handleFileTransferCancel(std::string id) { } void ChatController::handleFileTransferStart(std::string id, std::string description) { - std::cout << "handleFileTransferStart(" << id << ", " << description << ")" << std::endl; + SWIFT_LOG(debug) << "handleFileTransferStart(" << id << ", " << description << ")" << std::endl; if (ftControllers.find(id) != ftControllers.end()) { ftControllers[id]->start(description); } else { @@ -266,7 +266,7 @@ void ChatController::handleFileTransferStart(std::string id, std::string descrip } void ChatController::handleFileTransferAccept(std::string id, std::string filename) { - std::cout << "handleFileTransferAccept(" << id << ", " << filename << ")" << std::endl; + SWIFT_LOG(debug) "handleFileTransferAccept(" << id << ", " << filename << ")" << std::endl; if (ftControllers.find(id) != ftControllers.end()) { ftControllers[id]->accept(filename); } else { @@ -275,7 +275,7 @@ void ChatController::handleFileTransferAccept(std::string id, std::string filena } void ChatController::handleSendFileRequest(std::string filename) { - std::cout << "ChatController::handleSendFileRequest(" << filename << ")" << std::endl; + SWIFT_LOG(debug) << "ChatController::handleSendFileRequest(" << filename << ")" << std::endl; eventStream_->send(boost::make_shared<SendFileUIEvent>(getToJID(), filename)); } diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp index afa907d..f1fd19e 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.cpp +++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp @@ -11,6 +11,7 @@ #include <Swiften/Base/boost_bsignals.h> #include <boost/bind.hpp> #include "Swift/Controllers/UIInterfaces/ChatWindow.h" +#include <Swiften/Base/Log.h> #include <boost/smart_ptr/make_shared.hpp> @@ -69,7 +70,7 @@ boost::uintmax_t FileTransferController::getSize() const { } void FileTransferController::start(std::string& description) { - std::cout << "FileTransferController::start" << std::endl; + SWIFT_LOG("DEBUG") << "FileTransferController::start" << std::endl; fileReadStream = boost::make_shared<FileReadBytestream>(boost::filesystem::path(filename)); OutgoingFileTransfer::ref outgoingTransfer = ftManager->createOutgoingFileTransfer(otherParty, boost::filesystem::path(filename), description, fileReadStream); if (outgoingTransfer) { @@ -85,7 +86,7 @@ void FileTransferController::start(std::string& description) { } void FileTransferController::accept(std::string& file) { - std::cout << "FileTransferController::accept" << std::endl; + SWIFT_LOG("DEBUG") << "FileTransferController::accept" << std::endl; IncomingFileTransfer::ref incomingTransfer = boost::dynamic_pointer_cast<IncomingFileTransfer>(transfer); if (incomingTransfer) { fileWriteStream = boost::make_shared<FileWriteBytestream>(boost::filesystem::path(file)); diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp index 0164ee5..5680996 100644 --- a/Swift/QtUI/QtChatWindow.cpp +++ b/Swift/QtUI/QtChatWindow.cpp @@ -46,8 +46,7 @@ #include <QFileDialog> #include <QMenu> #include <Swift/Controllers/Settings/SettingsProvider.h> - -#include <QDebug> +#include <Swiften/Base/Log.h> namespace Swift { @@ -531,7 +530,7 @@ QString QtChatWindow::buildChatWindowButton(const QString& name, const QString& } std::string QtChatWindow::addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes) { - qDebug() << "addFileTransfer"; + SWIFT_LOG(debug) << "addFileTransfer" << std::endl; QString ft_id = QString("ft%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++))); QString htmlString; @@ -617,7 +616,7 @@ void QtChatWindow::handleHTMLButtonClicked(QString id, QString arg1, QString arg messageLog_->setMUCInvitationJoined(elementID); } else { - qDebug() << "Unknown HTML button! ( " << id << " )"; + SWIFT_LOG(debug) << "Unknown HTML button! ( " << Q2PSTRING(id) << " )" << std::endl; } } @@ -668,7 +667,7 @@ void QtChatWindow::replaceMessage(const std::string& message, const std::string& messageLog_->replaceMessage(messageHTML, P2QSTRING(id), B2QDATE(time)); } else { - qWarning() << "Trying to replace a message with no id"; + std::cerr << "Trying to replace a message with no id"; } } |