summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2015-01-30 21:06:53 (GMT)
committerMontel Laurent <montel@kde.org>2015-01-30 21:06:53 (GMT)
commitc4f224f1e8f31c374da33f83c4998641be7e7769 (patch)
tree7b4a3bad0385b396a62ef4bcf96d8bf810f6500d
parente176acdc4013ee0d4b44c2d58404a7aebf073160 (diff)
Port to new connect api
-rw-r--r--conf/widgetannottools.cpp4
-rw-r--r--core/chooseenginedialog.cpp4
-rw-r--r--shell/main.cpp3
3 files changed, 6 insertions, 5 deletions
diff --git a/conf/widgetannottools.cpp b/conf/widgetannottools.cpp
index 7934d91..bd597c7 100644
--- a/conf/widgetannottools.cpp
+++ b/conf/widgetannottools.cpp
@@ -266,8 +266,8 @@ EditAnnotToolDialog::EditAnnotToolDialog( QWidget *parent, const QDomElement &in
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
- connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
- connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+ connect(buttonBox, &QDialogButtonBox::accepted, this, &EditAnnotToolDialog::accept);
+ connect(buttonBox, &QDialogButtonBox::rejected, this, &EditAnnotToolDialog::reject);
okButton->setDefault(true);
QLabel * tmplabel;
diff --git a/core/chooseenginedialog.cpp b/core/chooseenginedialog.cpp
index 40881d8..2800d98 100644
--- a/core/chooseenginedialog.cpp
+++ b/core/chooseenginedialog.cpp
@@ -29,8 +29,8 @@ ChooseEngineDialog::ChooseEngineDialog( const QStringList &generators, const QMi
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
- connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
- connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+ connect(buttonBox, &QDialogButtonBox::accepted, this, &ChooseEngineDialog::accept);
+ connect(buttonBox, &QDialogButtonBox::rejected, this, &ChooseEngineDialog::reject);
okButton->setDefault(true);
QWidget *main = new QWidget( this );
m_widget = new Ui_ChooseEngineWidget();
diff --git a/shell/main.cpp b/shell/main.cpp
index 6146cb3..eef74a4 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -29,9 +29,10 @@
int main(int argc, char** argv)
{
+ QApplication app(argc, argv);
+
KAboutData aboutData = okularAboutData();
- QApplication app(argc, argv);
app.setApplicationName(aboutData.applicationData().componentName());
app.setApplicationDisplayName(aboutData.applicationData().displayName());
app.setApplicationVersion(aboutData.version());