convert all exceptions from utf8 explicitly

whoozle · May 4, 2015 · 09db8ae · 09db8ae
1 parent beb7df5
commit 09db8ae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/qt/commandqueue.cpp b/qt/commandqueue.cpp
@@ -1,5 +1,6 @@
 #include "commandqueue.h"
 #include "mtpobjectsmodel.h"
+#include "utils.h"
 #include <QFileInfo>
 #include <QDebug>
 #include <QApplication>
@@ -20,7 +21,7 @@ void UploadFile::execute(CommandQueue &queue)
 	{
 		queue.model()->uploadFile(fi.fileName());
 	} catch(const std::exception &ex)
-	{ qDebug() << "uploading file " << Filename << " failed: " << ex.what(); }
+	{ qDebug() << "uploading file " << Filename << " failed: " << fromUtf8(ex.what()); }
 
 	queue.addProgress(fi.size());
 }
@@ -35,7 +36,7 @@ void DownloadFile::execute(CommandQueue &queue)
 	{
 		queue.model()->downloadFile(Filename, ObjectId);
 	} catch(const std::exception &ex)
-	{ qDebug() << "downloading file " << Filename << " failed: " << ex.what(); }
+	{ qDebug() << "downloading file " << Filename << " failed: " << fromUtf8(ex.what()); }
 
 	queue.addProgress(fi.size());
 }

diff --git a/qt/main.cpp b/qt/main.cpp
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 #include "mainwindow.h"
+#include "utils.h"
 #include <QApplication>
 #include <QMessageBox>
 
@@ -34,7 +35,7 @@ namespace
 			try {
 				return QApplication::notify( receiver, e );
 			} catch ( const std::exception& e ) {
-				QMessageBox::warning(0, "Error", e.what());
+				QMessageBox::warning(0, "Error", fromUtf8(e.what()));
 				return false;
 			}
 		}

diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
@@ -102,7 +102,7 @@ void MainWindow::showEvent(QShowEvent *)
 			}
 			catch(const mtp::usb::TimeoutException &ex)
 			{
-				qDebug() << "timed out getting device info: " << ex.what() << ", retrying...";
+				qDebug() << "timed out getting device info: " << fromUtf8(ex.what()) << ", retrying...";
 				if (attempt + 1 == MaxAttempts)
 				{
 					QMessageBox::critical(this, tr("MTP"), tr("MTP device does not respond"));

diff --git a/qt/mtpobjectsmodel.cpp b/qt/mtpobjectsmodel.cpp
@@ -85,7 +85,7 @@ mtp::msg::ObjectInfoPtr MtpObjectsModel::Row::GetInfo(mtp::SessionPtr session)
 			//qDebug() << fromUtf8(row.Info->Filename);
 		}
 		catch(const std::exception &ex)
-		{ qDebug() << "failed to get object info " << ex.what(); }
+		{ qDebug() << "failed to get object info " << fromUtf8(ex.what()); }
 	}
 	return _info;
 }