[repo.or.cz] nomnom.git branch next updated: v0.2.0-7-g49ae0c9
Brought to you by:
legatvs
Menu
▾
▴
[repo.or.cz] nomnom.git branch next updated: v0.2.0-7-g49ae0c9
|
From: <nom...@li...> - 2011-10-27 14:36:48
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.
The branch, next has been updated
via 49ae0c95905f819a96a214b3278d28d4c439df38 (commit)
from d89b9cbf3e03965b17801196c7e81b5a8ee4b25d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/49ae0c95905f819a96a214b3278d28d4c439df38
commit 49ae0c95905f819a96a214b3278d28d4c439df38
Author: Toni Gundogdu <le...@gm...>
Date: Thu Oct 27 17:36:53 2011 +0300
Use qApp instead, use NUtil info() instead
diff --git a/src/feed/nfeeddialog.cpp b/src/feed/nfeeddialog.cpp
index e287f58..e3f534c 100644
--- a/src/feed/nfeeddialog.cpp
+++ b/src/feed/nfeeddialog.cpp
@@ -26,6 +26,8 @@
#include <NFeedProgressDialog>
#include <NErrorWhileDialog>
#include <NFeedDialog>
+#include <NSettings>
+#include <NUtil>
extern nn::feed::NFeedList feedItems; // main.cpp
@@ -83,12 +85,12 @@ void NFeedDialog::done(int n)
if (feedItems.count() == 0)
{
_toolbox->setCurrentIndex(0);
- m_info(this, tr("Please read a feed"));
+ info(this, tr("Please read a feed"));
}
else
{
_toolbox->setCurrentIndex(1);
- m_info(this, tr("Please select an item from the list"));
+ info(this, tr("Please select an item from the list"));
}
return;
}
@@ -97,11 +99,6 @@ void NFeedDialog::done(int n)
close();
}
-void NFeedDialog::m_info(QWidget *parent, const QString& msg)
-{
- QMessageBox::information(parent, QCoreApplication::applicationName(), msg);
-}
-
bool NFeedDialog::foreachWidget()
{
const int c = _toolbox->count();
diff --git a/src/feed/nfeeddialog.h b/src/feed/nfeeddialog.h
index efd10f9..815f466 100644
--- a/src/feed/nfeeddialog.h
+++ b/src/feed/nfeeddialog.h
@@ -36,8 +36,6 @@ class NFeedDialog : public QDialog
{
Q_OBJECT
public:
- static void m_info(QWidget*, const QString&);
-public:
NFeedDialog(QWidget *parent, const QStringList&);
public:
QString selected() const;
diff --git a/src/feed/nfeeddialog_properties.cpp b/src/feed/nfeeddialog_properties.cpp
index 6faf7d7..a808935 100644
--- a/src/feed/nfeeddialog_properties.cpp
+++ b/src/feed/nfeeddialog_properties.cpp
@@ -31,7 +31,9 @@
#include <QLabel>
#include <NFeedDialog>
+#include <NSettings>
#include <NFeed>
+#include <NUtil>
extern bool have_umph_feature_all; // main.cpp
@@ -198,7 +200,7 @@ void NFeedProperties::parse()
{
// Potential translation hack-up.
QString s = _identLabel->text().remove("&").split(" ").takeLast();
- NFeedDialog::m_info(this, tr("Please enter %1").arg(s));
+ info(this, tr("Please enter %1").arg(s));
_identEdit->setFocus();
return;
}
diff --git a/src/lang/nlang.cpp b/src/lang/nlang.cpp
index a546980..2b34368 100644
--- a/src/lang/nlang.cpp
+++ b/src/lang/nlang.cpp
@@ -68,7 +68,7 @@ static QFileInfoList scan_for_qm(const QString& scanDir,
*/
static QString filemask()
{
- return QString("%1_??_??.qm").arg(QCoreApplication::applicationName());
+ return QString("%1_??_??.qm").arg(qApp->applicationName());
}
/*
diff --git a/src/settings/nsettingsdialog.cpp b/src/settings/nsettingsdialog.cpp
index 10ab3a4..68cd439 100644
--- a/src/settings/nsettingsdialog.cpp
+++ b/src/settings/nsettingsdialog.cpp
@@ -25,6 +25,7 @@
#include <NSettingsMutator>
#include <NSettingsDialog>
+#include <NUtil>
extern nn::NSettingsMutator settings; // main.cpp
@@ -78,11 +79,6 @@ void NSettingsDialog::done(int n)
close();
}
-void NSettingsDialog::m_info(QWidget *parent, const QString& msg)
-{
- QMessageBox::information(parent, QCoreApplication::applicationName(), msg);
-}
-
bool NSettingsDialog::foreachWidget(Mode mode)
{
const int c = toolbox->count();
@@ -96,7 +92,7 @@ bool NSettingsDialog::foreachWidget(Mode mode)
if (mode == To && !s->verify(msg))
{
toolbox->setCurrentWidget(s);
- NSettingsDialog::m_info(this, msg);
+ info(this, msg);
return false;
}
diff --git a/src/settings/nsettingsdialog.h b/src/settings/nsettingsdialog.h
index c7de4d3..40a30ea 100644
--- a/src/settings/nsettingsdialog.h
+++ b/src/settings/nsettingsdialog.h
@@ -44,8 +44,6 @@ class NSettingsDialog : public QDialog
Q_OBJECT
public:
NSettingsDialog(QWidget *parent=NULL);
-public:
- static void m_info(QWidget*, const QString&);
protected:
void done(int);
private:
diff --git a/src/settings/nsettingsdialog_options.cpp b/src/settings/nsettingsdialog_options.cpp
index 24bc01b..af780a2 100644
--- a/src/settings/nsettingsdialog_options.cpp
+++ b/src/settings/nsettingsdialog_options.cpp
@@ -22,6 +22,7 @@
#include <NSettingsMutator>
#include <NSettingsDialog>
+#include <NUtil>
extern nn::NSettingsMutator settings; // main.cpp
@@ -79,7 +80,7 @@ bool NSettingsOptions::foreachWidget(Mode mode)
if (!o->verify(msg))
{
tabWidget->setCurrentWidget(o);
- NSettingsDialog::m_info(this, msg);
+ info(this, msg);
return false;
}
diff --git a/src/util/nutil.cpp b/src/util/nutil.cpp
index 4b0b1b7..31dbb5f 100644
--- a/src/util/nutil.cpp
+++ b/src/util/nutil.cpp
@@ -49,7 +49,7 @@ namespace nn
int ask(QWidget *p, const QString& t)
{
const QMessageBox::StandardButtons b = QMessageBox::Yes|QMessageBox::No;
- return QMessageBox::question(p, QCoreApplication::applicationName(), t, b);
+ return QMessageBox::question(p, qApp->applicationName(), t, b);
}
/*
@@ -63,7 +63,7 @@ int ask(QWidget *p, const QString& t)
*/
void info(QWidget *p, const QString& t)
{
- QMessageBox::information(p, QCoreApplication::applicationName(), t);
+ QMessageBox::information(p, qApp->applicationName(), t);
}
/*
-----------------------------------------------------------------------
Summary of changes:
src/feed/nfeeddialog.cpp | 11 ++++-------
src/feed/nfeeddialog.h | 2 --
src/feed/nfeeddialog_properties.cpp | 4 +++-
src/lang/nlang.cpp | 2 +-
src/settings/nsettingsdialog.cpp | 8 ++------
src/settings/nsettingsdialog.h | 2 --
src/settings/nsettingsdialog_options.cpp | 3 ++-
src/util/nutil.cpp | 4 ++--
8 files changed, 14 insertions(+), 22 deletions(-)
repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
--
nomnom.git ("The graphical media download tool")
|