[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepimlibs] kpimtextedit/src: Port to new connect api
From: Montel Laurent <montel () kde ! org>
Date: 2014-09-30 21:13:46
Message-ID: E1XZ4jy-0007k4-E2 () scm ! kde ! org
[Download RAW message or body]
Git commit a3f7d6434b340deb32b08e9013d112fc400c5245 by Montel Laurent.
Committed on 30/09/2014 at 17:40.
Pushed by mlaurent into branch 'master'.
Port to new connect api
M +1 -2 kpimtextedit/src/emoticontexteditaction.cpp
M +2 -4 kpimtextedit/src/emoticontexteditselector.cpp
M +1 -2 kpimtextedit/src/tablecellformatdialog.cpp
M +1 -2 kpimtextedit/src/tableformatdialog.cpp
http://commits.kde.org/kdepimlibs/a3f7d6434b340deb32b08e9013d112fc400c5245
diff --git a/kpimtextedit/src/emoticontexteditaction.cpp \
b/kpimtextedit/src/emoticontexteditaction.cpp index 4acb9e2..46e4182 100644
--- a/kpimtextedit/src/emoticontexteditaction.cpp
+++ b/kpimtextedit/src/emoticontexteditaction.cpp
@@ -56,8 +56,7 @@ EmoticonTextEditAction::EmoticonTextEditAction(QObject *parent)
setMenu(d->emoticonMenu);
setIcon(QIcon::fromTheme(QLatin1String("face-smile")));
setDelayed(false);
- connect(d->selector, SIGNAL(itemSelected(QString)),
- this, SIGNAL(emoticonActivated(QString)));
+ connect(d->selector, &EmoticonTextEditSelector::itemSelected, this, \
&EmoticonTextEditAction::emoticonActivated); }
EmoticonTextEditAction::~EmoticonTextEditAction()
diff --git a/kpimtextedit/src/emoticontexteditselector.cpp \
b/kpimtextedit/src/emoticontexteditselector.cpp index 33bff94..6ec946a 100644
--- a/kpimtextedit/src/emoticontexteditselector.cpp
+++ b/kpimtextedit/src/emoticontexteditselector.cpp
@@ -82,10 +82,8 @@ EmoticonTextEditSelector::EmoticonTextEditSelector(QWidget \
*parent)
d->listEmoticon->setSelectionMode(QAbstractItemView::SingleSelection);
d->listEmoticon->setMouseTracking(true);
d->listEmoticon->setDragEnabled(false);
- connect(d->listEmoticon, SIGNAL(itemEntered(QListWidgetItem*)),
- this, SLOT(slotMouseOverItem(QListWidgetItem*)));
- connect(d->listEmoticon, SIGNAL(itemClicked(QListWidgetItem*)),
- this, SLOT(slotEmoticonClicked(QListWidgetItem*)));
+ connect(d->listEmoticon, &QListWidget::itemEntered, this, \
&EmoticonTextEditSelector::slotMouseOverItem); + connect(d->listEmoticon, \
&QListWidget::itemClicked, this, &EmoticonTextEditSelector::slotEmoticonClicked); }
EmoticonTextEditSelector::~EmoticonTextEditSelector()
diff --git a/kpimtextedit/src/tablecellformatdialog.cpp \
b/kpimtextedit/src/tablecellformatdialog.cpp index 2c527a3..021ffd3 100644
--- a/kpimtextedit/src/tablecellformatdialog.cpp
+++ b/kpimtextedit/src/tablecellformatdialog.cpp
@@ -67,8 +67,7 @@ public:
sep = new KSeparator;
mainLayout->addWidget(sep);
backgroundColor->setEnabled(false);
- q->connect(useBackgroundColor, SIGNAL(toggled(bool)),
- backgroundColor, SLOT(setEnabled(bool)));
+ q->connect(useBackgroundColor, &QCheckBox::toggled, backgroundColor, \
&KColorButton::setEnabled);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel);
buttonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | \
Qt::Key_Return);
diff --git a/kpimtextedit/src/tableformatdialog.cpp \
b/kpimtextedit/src/tableformatdialog.cpp index 3f0b923..29df621 100644
--- a/kpimtextedit/src/tableformatdialog.cpp
+++ b/kpimtextedit/src/tableformatdialog.cpp
@@ -104,8 +104,7 @@ public:
sep = new KSeparator;
lay->addWidget(sep);
backgroundColor->setEnabled(false);
- q->connect(useBackgroundColor, SIGNAL(toggled(bool)),
- backgroundColor, SLOT(setEnabled(bool)));
+ q->connect(useBackgroundColor, &QCheckBox::toggled, backgroundColor, \
&KColorButton::setEnabled);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel); connect(buttonBox, SIGNAL(accepted()), q, \
SLOT(accept())); connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject()));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic