silence warnings found by clang++

diff --git a/qt/app.cc b/qt/app.cc
index a4fd18cd299ef62fc2ed963eabd57c740a3015a0..8e3bf5e3f3b089a4f5a94643712c9bb7281f6456 100644 (file)
--- a/qt/app.cc
+++ b/qt/app.cc
@@ -291,7 +291,7 @@ MyApp :: onTorrentCompleted (int id)
   if (tor)
     {
       if (myPrefs->getBool (Prefs::SHOW_NOTIFICATION_ON_COMPLETE))
-        notify (tr ("Torrent Completed"), tor->name ());
+        notifyApp (tr ("Torrent Completed"), tor->name ());
 
       if (myPrefs->getBool (Prefs::COMPLETE_SOUND_ENABLED))
         {
@@ -315,7 +315,7 @@ MyApp :: onNewTorrentChanged (int id)
     {
       const int age_secs = tor->dateAdded ().secsTo (QDateTime::currentDateTime ());
       if (age_secs < 30)
-        notify (tr ("Torrent Added"), tor->name ());
+        notifyApp (tr ("Torrent Added"), tor->name ());
 
       disconnect (tor, SIGNAL (torrentChanged (int)), this, SLOT (onNewTorrentChanged (int)));
 
@@ -459,7 +459,7 @@ MyApp :: raise ()
 }
 
 bool
-MyApp :: notify (const QString& title, const QString& body) const
+MyApp :: notifyApp (const QString& title, const QString& body) const
 {
   const QString dbusServiceName   = QString::fromUtf8 ("org.freedesktop.Notifications");
   const QString dbusInterfaceName = QString::fromUtf8 ("org.freedesktop.Notifications");

diff --git a/qt/app.h b/qt/app.h
index 3d4eaa22997b8d457350924388177d00c4326d66..8859ad0c71ca4070c0cf0dceff310c0c34068537 100644 (file)
--- a/qt/app.h
+++ b/qt/app.h
@@ -34,7 +34,7 @@ class MyApp: public QApplication
 
   public:
     void raise ();
-    bool notify (const QString& title, const QString& body) const;
+    bool notifyApp (const QString& title, const QString& body) const;
 
   public:
     Favicons favicons;

diff --git a/qt/mainwin.cc b/qt/mainwin.cc
index d8cf0e42f8950022780d8bb1faab5e6471bcc45d..f3c986acbb8271868192ffc6da538134f2a41af3 100644 (file)
--- a/qt/mainwin.cc
+++ b/qt/mainwin.cc
@@ -81,22 +81,6 @@ TrMainWindow :: getStockIcon (const QString& name, int fallback)
   return icon;
 }
 
-namespace
-{
-  QSize calculateTextButtonSizeHint (QPushButton * button)
-  {
-    QStyleOptionButton opt;
-    opt.initFrom (button);
-    QString s (button->text ());
-    if (s.isEmpty ())
-      s = QString::fromLatin1 ("XXXX");
-    QFontMetrics fm = button->fontMetrics ();
-    QSize sz = fm.size (Qt::TextShowMnemonic, s);
-    return button->style ()->sizeFromContents (QStyle::CT_PushButton, &opt, sz, button).expandedTo (QApplication::globalStrut ());
-  }
-}
-
-
 TrMainWindow :: TrMainWindow (Session& session, Prefs& prefs, TorrentModel& model, bool minimized):
   myLastFullUpdateTime (0),
   mySessionDialog (new SessionDialog (session, prefs, this)),
@@ -1170,6 +1154,7 @@ TrMainWindow :: newTorrent ()
 void
 TrMainWindow :: openTorrent ()
 {
+std::cerr << __FILE__ << ':' << __LINE__ << std::endl;
   QFileDialog * d;
   d = new QFileDialog (this,
                        tr ("Open Torrent"),

diff --git a/qt/qtr.pro b/qt/qtr.pro
index f390053975385920738a4597a3c44e57a429f205..a800ddcd7f8930071e8aeddad6ccc4bd00262405 100644 (file)
--- a/qt/qtr.pro
+++ b/qt/qtr.pro
@@ -11,7 +11,7 @@ unix: INSTALLS += man
 man.path = /share/man/man1/
 man.files = transmission-qt.1
 
-CONFIG += qt thread debug link_pkgconfig c++11
+CONFIG += qt thread debug link_pkgconfig c++11 warn_on
 QT += network dbus
 PKGCONFIG = fontconfig libcurl openssl libevent