Hello community,
here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2014-03-11 20:33:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2014-03-01 14:38:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2014-03-11 20:33:40.000000000 +0100
@@ -1,0 +2,20 @@
+Mon Mar 10 12:22:47 UTC 2014 - mvidner@suse.com
+
+- set parent of context menu, to apply style sheets (tgoettlicher)
+- 2.46.0
+
+-------------------------------------------------------------------
+Mon Mar 10 10:15:34 UTC 2014 - mvidner@suse.com
+
+- make color of help text search result stylable (tgoettlicher)
+- 2.45.4
+
+-------------------------------------------------------------------
+Mon Mar 3 17:03:32 UTC 2014 - mvidner@suse.com
+
+- fixed tab switching in Qt5, for example during package installation
+- declared pclass(ptr) macro to help with compile time type checking
+ of Qt signals
+- 2.45.3
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-2.45.2.tar.bz2
New:
----
libyui-qt-2.46.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-doc.spec ++++++
--- /var/tmp/diff_new_pack.K4P3ph/_old 2014-03-11 20:33:40.000000000 +0100
+++ /var/tmp/diff_new_pack.K4P3ph/_new 2014-03-11 20:33:40.000000000 +0100
@@ -17,7 +17,7 @@
Name: libyui-qt-doc
-Version: 2.45.2
+Version: 2.46.0
Release: 0
Source: libyui-qt-%{version}.tar.bz2
++++++ libyui-qt.spec ++++++
--- /var/tmp/diff_new_pack.K4P3ph/_old 2014-03-11 20:33:40.000000000 +0100
+++ /var/tmp/diff_new_pack.K4P3ph/_new 2014-03-11 20:33:40.000000000 +0100
@@ -17,7 +17,7 @@
Name: libyui-qt
-Version: 2.45.2
+Version: 2.46.0
Release: 0
Source: libyui-qt-%{version}.tar.bz2
++++++ libyui-qt-2.45.2.tar.bz2 -> libyui-qt-2.46.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/ChangeLog new/libyui-qt-2.46.0/ChangeLog
--- old/libyui-qt-2.45.2/ChangeLog 2014-02-27 16:25:40.000000000 +0100
+++ new/libyui-qt-2.46.0/ChangeLog 2014-03-11 11:22:35.000000000 +0100
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Mon Mar 10 12:22:47 UTC 2014 - mvidner@suse.com
+
+- set parent of context menu, to apply style sheets (tgoettlicher)
+- 2.46.0
+
+-------------------------------------------------------------------
+Mon Mar 10 10:15:34 UTC 2014 - mvidner@suse.com
+
+- make color of help text search result stylable (tgoettlicher)
+- 2.45.4
+
+-------------------------------------------------------------------
+Mon Mar 3 17:03:32 UTC 2014 - mvidner@suse.com
+
+- fixed tab switching in Qt5, for example during package installation
+- declared pclass(ptr) macro to help with compile time type checking
+ of Qt signals
+- 2.45.3
+
+-------------------------------------------------------------------
Thu Feb 27 14:59:54 UTC 2014 - mvidner@suse.com
- Fixed save_y2logs invocation (bnc#866056).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/VERSION.cmake new/libyui-qt-2.46.0/VERSION.cmake
--- old/libyui-qt-2.45.2/VERSION.cmake 2014-02-27 16:25:40.000000000 +0100
+++ new/libyui-qt-2.46.0/VERSION.cmake 2014-03-11 11:22:35.000000000 +0100
@@ -1,6 +1,6 @@
SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "45")
-SET(VERSION_PATCH "2")
+SET(VERSION_MINOR "46")
+SET(VERSION_PATCH "0")
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/QY2ComboTabWidget.cc new/libyui-qt-2.46.0/src/QY2ComboTabWidget.cc
--- old/libyui-qt-2.45.2/src/QY2ComboTabWidget.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/QY2ComboTabWidget.cc 2014-03-11 11:22:35.000000000 +0100
@@ -35,6 +35,7 @@
#define YUILogComponent "qt-pkg"
#include
+#include "YQUI.h"
#include "QY2ComboTabWidget.h"
@@ -72,8 +73,8 @@
hbox->addWidget(combo_box);
combo_label->setBuddy( combo_box );
combo_box->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert
- connect( combo_box, SIGNAL( activated( int ) ),
- this, SLOT ( showPageIndex ( int ) ) );
+ connect( combo_box, static_cast(&QComboBox::activated),
+ this, &pclass(this)::showPageIndex );
widget_stack = new QStackedWidget( this );
Q_CHECK_PTR( widget_stack );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/QY2HelpDialog.cc new/libyui-qt-2.46.0/src/QY2HelpDialog.cc
--- old/libyui-qt-2.45.2/src/QY2HelpDialog.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/QY2HelpDialog.cc 2014-03-11 11:22:35.000000000 +0100
@@ -44,14 +44,15 @@
QY2HelpDialog::QY2HelpDialog( const QString& helpText, QWidget *parent )
: QDialog( parent )
+ , _searchResultForeground(Qt::black)
+ , _searchResultBackground(Qt::yellow)
{
_ui = new Ui_QHelpDialog();
_ui->setupUi( this );
_ui->textBrowser->setText( helpText );
-
_ui->label->setPixmap ( QPixmap( viewmag ) );
- connect( _ui->lineEdit, SIGNAL( textEdited( QString ) ),
- SLOT( searchStringChanged( QString ) ) );
+ connect( _ui->lineEdit, &pclass(_ui->lineEdit)::textEdited,
+ this, &pclass(this)::searchStringChanged );
_ui->lineEdit->setFocus( Qt::OtherFocusReason );
_ui->pushButton->setAutoDefault(false);
@@ -83,7 +84,8 @@
void QY2HelpDialog::searchStringChanged( QString text )
{
QTextCharFormat fmt;
- fmt.setBackground( Qt::yellow );
+ fmt.setBackground(getSearchResultBackground());
+ fmt.setForeground(getSearchResultForeground());
QTextDocument *d = _ui->textBrowser->document();
QTextCursor all(d);
@@ -112,4 +114,26 @@
}
+QColor QY2HelpDialog::getSearchResultForeground()
+{
+ return _searchResultForeground;
+}
+
+void QY2HelpDialog::setSearchResultForeground( QColor pen )
+{
+ _searchResultForeground = pen;
+}
+
+QColor QY2HelpDialog::getSearchResultBackground()
+{
+ return _searchResultBackground;
+}
+
+void QY2HelpDialog::setSearchResultBackground( QColor pen )
+{
+ _searchResultBackground = pen;
+}
+
+
+
#include "QY2HelpDialog.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/QY2HelpDialog.h new/libyui-qt-2.46.0/src/QY2HelpDialog.h
--- old/libyui-qt-2.45.2/src/QY2HelpDialog.h 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/QY2HelpDialog.h 2014-03-11 11:22:35.000000000 +0100
@@ -28,6 +28,7 @@
#define _QY2HelpDialog_h
#include <QDialog>
+#include <QColor>
class QTextCursor;
class Ui_QHelpDialog;
@@ -35,12 +36,18 @@
class QY2HelpDialog : public QDialog
{
Q_OBJECT
+ Q_PROPERTY(QColor searchResultForeground READ getSearchResultForeground WRITE setSearchResultForeground DESIGNABLE true)
+ Q_PROPERTY(QColor searchResultBackground READ getSearchResultBackground WRITE setSearchResultBackground DESIGNABLE true)
public:
QY2HelpDialog( const QString &helpText, QWidget *parent );
~QY2HelpDialog();
void setHelpText( const QString &helpText );
void retranslate();
+ QColor getSearchResultForeground();
+ QColor getSearchResultBackground();
+ void setSearchResultForeground( QColor pen );
+ void setSearchResultBackground( QColor pen );
public slots:
void searchStringChanged( QString );
@@ -48,6 +55,8 @@
private:
Ui_QHelpDialog *_ui;
QList<QTextCursor> _marks;
+ QColor _searchResultForeground;
+ QColor _searchResultBackground;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/QY2ListView.cc new/libyui-qt-2.46.0/src/QY2ListView.cc
--- old/libyui-qt-2.45.2/src/QY2ListView.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/QY2ListView.cc 2014-03-11 11:22:35.000000000 +0100
@@ -28,6 +28,7 @@
#include <QPixmap>
#include <QHeaderView>
#include <QMouseEvent>
+#include "YQUI.h"
#include "QY2ListView.h"
#define YUILogComponent "qt-pkg"
@@ -56,14 +57,14 @@
header()->setStretchLastSection( false );
}
- connect( header(), SIGNAL( sectionResized ( int, int, int ) ),
- this, SLOT ( columnWidthChanged ( int, int, int ) ) );
+ connect( header(), &pclass(header())::sectionResized,
+ this, &pclass(this)::columnWidthChanged );
- connect( this, SIGNAL( itemExpanded ( QTreeWidgetItem *) ),
- this, SLOT ( treeExpanded ( QTreeWidgetItem *) ) );
+ connect( this, &pclass(this)::itemExpanded,
+ this, &pclass(this)::treeExpanded );
- connect( this, SIGNAL( itemCollapsed ( QTreeWidgetItem *) ),
- this, SLOT ( treeCollapsed ( QTreeWidgetItem *) ) );
+ connect( this, &pclass(this)::itemCollapsed,
+ this, &pclass(this)::treeCollapsed );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/QY2StyleEditor.cc new/libyui-qt-2.46.0/src/QY2StyleEditor.cc
--- old/libyui-qt-2.45.2/src/QY2StyleEditor.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/QY2StyleEditor.cc 2014-03-11 11:22:35.000000000 +0100
@@ -24,6 +24,7 @@
/-*/
+#include "YQUI.h"
#include "QY2StyleEditor.h"
#include "QY2Styler.h"
#include "ui_QStyleEditor.h"
@@ -44,20 +45,20 @@
ui.closeButton->setAutoDefault(false);
setWindowTitle( _( "Stylesheet Editor" ) );
- connect( ui.applyButton, SIGNAL( clicked() ),
- this, SLOT( slotApplyStyle() ));
+ connect( ui.applyButton, &pclass(ui.applyButton)::clicked,
+ this, &pclass(this)::slotApplyStyle);
- connect( ui.closeButton, SIGNAL( clicked() ),
- this, SLOT( close() ));
+ connect( ui.closeButton, &pclass(ui.closeButton)::clicked,
+ this, &pclass(this)::close);
- connect( ui.loadButton, SIGNAL( clicked() ),
- this, SLOT( slotLoadFile() ));
+ connect( ui.loadButton, &pclass(ui.loadButton)::clicked,
+ this, &pclass(this)::slotLoadFile);
- connect( ui.textEdit, SIGNAL( textChanged() ),
- this, SLOT( slotTextChanged() ));
+ connect( ui.textEdit, &pclass(ui.textEdit)::textChanged,
+ this, &pclass(this)::slotTextChanged);
- connect( ui.autoApply, SIGNAL( stateChanged(int) ),
- this, SLOT( slotTextChanged() ));
+ connect( ui.autoApply, &pclass(ui.autoApply)::stateChanged,
+ this, &pclass(this)::slotTextChanged);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQApplication.cc new/libyui-qt-2.46.0/src/YQApplication.cc
--- old/libyui-qt-2.45.2/src/YQApplication.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQApplication.cc 2014-03-11 11:22:35.000000000 +0100
@@ -541,7 +541,12 @@
bool
YQApplication::openContextMenu( const YItemCollection & itemCollection )
{
- YQContextMenu* menu = new YQContextMenu( _contextMenuPos );
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
+ YQContextMenu* menu = new YQContextMenu(parent, _contextMenuPos );
menu->addItems(itemCollection);
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQBusyIndicator.cc new/libyui-qt-2.46.0/src/YQBusyIndicator.cc
--- old/libyui-qt-2.45.2/src/YQBusyIndicator.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQBusyIndicator.cc 2014-03-11 11:22:35.000000000 +0100
@@ -58,7 +58,7 @@
setMinimumSize(MINIMUM_WITDH, MINIMUM_HEIGHT);
_timer = new QTimer(this);
- connect(_timer, SIGNAL(timeout()), this, SLOT(update()));
+ connect(_timer, &pclass(_timer)::timeout, this, &pclass(this)::update);
_timer->start(REPAINT_INTERVAL);
setFrameStyle (QFrame::Panel | QFrame::Sunken );
@@ -124,7 +124,7 @@
{
_timer = new QTimer(this);
- connect(_timer, SIGNAL(timeout()), this, SLOT(setStalled()));
+ connect(_timer, &pclass(_timer)::timeout, this, &pclass(this)::setStalled);
_timer->start(_timeout);
QVBoxLayout* layout = new QVBoxLayout( this );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQCheckBox.cc new/libyui-qt-2.46.0/src/YQCheckBox.cc
--- old/libyui-qt-2.45.2/src/YQCheckBox.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQCheckBox.cc 2014-03-11 11:22:35.000000000 +0100
@@ -48,8 +48,8 @@
QCheckBox::setChecked( checked );
- connect( this, SIGNAL( stateChanged( int ) ),
- this, SLOT ( stateChanged( int ) ) );
+ connect( this, &pclass(this)::stateChanged,
+ this, &pclass(this)::stateChanged );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQCheckBoxFrame.cc new/libyui-qt-2.46.0/src/YQCheckBoxFrame.cc
--- old/libyui-qt-2.45.2/src/YQCheckBoxFrame.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQCheckBoxFrame.cc 2014-03-11 11:22:35.000000000 +0100
@@ -51,8 +51,8 @@
QGroupBox::setCheckable( true );
setValue( checked );
- connect( this, SIGNAL( toggled ( bool ) ),
- this, SLOT ( stateChanged( bool ) ) );
+ connect( this, &pclass(this)::toggled,
+ this, &pclass(this)::stateChanged );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQComboBox.cc new/libyui-qt-2.46.0/src/YQComboBox.cc
--- old/libyui-qt-2.45.2/src/YQComboBox.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQComboBox.cc 2014-03-11 11:22:35.000000000 +0100
@@ -69,15 +69,15 @@
_caption->setBuddy( _qt_comboBox );
#if SEND_SELECTION_CHANGED_EVENT
- connect( _qt_comboBox, SIGNAL( highlighted (int) ),
- this, SLOT ( slotSelected(int) ) );
+ connect( _qt_comboBox, &pclass(_qt_comboBox)::highlighted,
+ this, &pclass(this)::slotSelected );
#endif
- connect( _qt_comboBox, SIGNAL( activated ( QString ) ),
- this, SLOT ( textChanged( QString ) ) );
+ connect( _qt_comboBox, static_cast(&QComboBox::activated),
+ this, &pclass(this)::textChanged );
- connect( _qt_comboBox, SIGNAL( editTextChanged( QString ) ),
- this, SLOT ( textChanged( QString ) ) );
+ connect( _qt_comboBox, &pclass(_qt_comboBox)::editTextChanged,
+ this, &pclass(this)::textChanged );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQContextMenu.cc new/libyui-qt-2.46.0/src/YQContextMenu.cc
--- old/libyui-qt-2.45.2/src/YQContextMenu.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQContextMenu.cc 2014-03-11 11:22:35.000000000 +0100
@@ -38,15 +38,17 @@
: QObject ()
, YContextMenu( )
, _suppressCancelEvent(false )
+ , _parent(0)
{
yuiWarning() << "YQContextMenu";
}
-YQContextMenu::YQContextMenu( const QPoint position )
+YQContextMenu::YQContextMenu( QWidget* parent, const QPoint position )
: QObject ()
, YContextMenu( )
, _position ( position )
+ , _parent(parent)
{
// NOP
}
@@ -61,15 +63,15 @@
void
YQContextMenu::rebuildMenuTree()
{
- QMenu * menu = new QMenu( 0 );
+ QMenu * menu = new QMenu( _parent );
YUI_CHECK_NEW( menu );
menu->setProperty( "class", "ycontextmenu QMenu" );
- connect( menu, SIGNAL( triggered ( QAction * ) ),
- this, SLOT ( menuEntryActivated( QAction * ) ) );
+ connect( menu, &pclass(menu)::triggered,
+ this, &pclass(this)::menuEntryActivated );
- connect( menu, SIGNAL( aboutToHide () ),
- this, SLOT ( slotMenuHidden () ) );
+ connect( menu, &pclass(menu)::aboutToHide,
+ this, &pclass(this)::slotMenuHidden );
//
// Recursively add Qt menu items from the YMenuItems
//
@@ -105,8 +107,8 @@
else
subMenu = parentMenu->addMenu( QIcon( icon ), fromUTF8( item->label() ));
- connect( subMenu, SIGNAL( triggered ( QAction * ) ),
- this, SLOT ( menuEntryActivated( QAction * ) ) );
+ connect( subMenu, &pclass(subMenu)::triggered,
+ this, &pclass(this)::menuEntryActivated );
rebuildMenuTree( subMenu, item->childrenBegin(), item->childrenEnd() );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQContextMenu.h new/libyui-qt-2.46.0/src/YQContextMenu.h
--- old/libyui-qt-2.45.2/src/YQContextMenu.h 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQContextMenu.h 2014-03-11 11:22:35.000000000 +0100
@@ -42,10 +42,8 @@
/**
* Constructor.
**/
-// YQContextMenu( YWidget * parent,
-// const std::string & label );
YQContextMenu( );
- YQContextMenu( const QPoint position );
+ YQContextMenu( QWidget* parent, const QPoint position );
/**
@@ -136,6 +134,7 @@
private:
QPoint _position;
bool _suppressCancelEvent;
+ QWidget* _parent;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQDialog.cc new/libyui-qt-2.46.0/src/YQDialog.cc
--- old/libyui-qt-2.45.2/src/YQDialog.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQDialog.cc 2014-03-11 11:22:35.000000000 +0100
@@ -113,8 +113,8 @@
YUI_CHECK_NEW( _waitForEventTimer );
_waitForEventTimer->setSingleShot( true );
- QObject::connect( _waitForEventTimer, SIGNAL( timeout() ),
- this, SLOT ( waitForEventTimeout() ) );
+ QObject::connect( _waitForEventTimer, &pclass(_waitForEventTimer)::timeout,
+ this, &pclass(this)::waitForEventTimeout );
QY2Styler::styler()->registerWidget( this );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQDownloadProgress.cc new/libyui-qt-2.46.0/src/YQDownloadProgress.cc
--- old/libyui-qt-2.45.2/src/YQDownloadProgress.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQDownloadProgress.cc 2014-03-11 11:22:35.000000000 +0100
@@ -62,8 +62,8 @@
_timer = new QTimer( this );
- connect( _timer, SIGNAL( timeout() ),
- this, SLOT ( pollFileSize() ) );
+ connect( _timer, &pclass(_timer)::timeout,
+ this, &pclass(this)::pollFileSize );
_timer->setSingleShot(false);
_timer->start( 250 );// millisec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQDumbTab.cc new/libyui-qt-2.46.0/src/YQDumbTab.cc
--- old/libyui-qt-2.45.2/src/YQDumbTab.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQDumbTab.cc 2014-03-11 11:22:35.000000000 +0100
@@ -59,8 +59,8 @@
setFocusProxy( _tabBar );
setFocusPolicy( Qt::TabFocus );
- connect( _tabBar, SIGNAL( selected ( int ) ),
- this, SLOT ( slotSelected( int ) ) );
+ connect( _tabBar, &pclass(_tabBar)::currentChanged,
+ this, &pclass(this)::slotSelected );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQInputField.cc new/libyui-qt-2.46.0/src/YQInputField.cc
--- old/libyui-qt-2.45.2/src/YQInputField.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQInputField.cc 2014-03-11 11:22:35.000000000 +0100
@@ -78,18 +78,18 @@
_caption->setBuddy( _qt_lineEdit );
- connect( _qt_lineEdit, SIGNAL( textChanged( const QString & ) ),
- this, SLOT ( changed ( const QString & ) ) );
+ connect( _qt_lineEdit, &pclass(_qt_lineEdit)::textChanged,
+ this, &pclass(this)::changed );
if ( passwordMode )
{
_qt_lineEdit->setEchoMode( QLineEdit::Password );
- connect( _qt_lineEdit, SIGNAL( capsLockActivated() ),
- this, SLOT ( displayCapsLockWarning() ) );
+ connect( _qt_lineEdit, &pclass(_qt_lineEdit)::capsLockActivated,
+ this, &pclass(this)::displayCapsLockWarning );
- connect( _qt_lineEdit, SIGNAL( capsLockDeactivated() ),
- this, SLOT ( clearCapsLockWarning() ) );
+ connect( _qt_lineEdit, &pclass(_qt_lineEdit)::capsLockDeactivated,
+ this, &pclass(this)::clearCapsLockWarning );
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQIntField.cc new/libyui-qt-2.46.0/src/YQIntField.cc
--- old/libyui-qt-2.45.2/src/YQIntField.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQIntField.cc 2014-03-11 11:22:35.000000000 +0100
@@ -70,8 +70,8 @@
setValue( initialValue );
- connect( _qt_spinBox, SIGNAL( valueChanged ( int ) ),
- this, SLOT ( valueChangedSlot( int ) ) );
+ connect( _qt_spinBox, static_cast(&QSpinBox::valueChanged),
+ this, &pclass(this)::valueChangedSlot );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQLogView.cc new/libyui-qt-2.46.0/src/YQLogView.cc
--- old/libyui-qt-2.45.2/src/YQLogView.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQLogView.cc 2014-03-11 11:22:35.000000000 +0100
@@ -66,7 +66,7 @@
_caption->setBuddy( _qt_text );
- connect (_qt_text, SIGNAL(resized()), this, SLOT(slotResize()));
+ connect (_qt_text, &pclass(_qt_text)::resized, this, &pclass(this)::slotResize);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQMenuButton.cc new/libyui-qt-2.46.0/src/YQMenuButton.cc
--- old/libyui-qt-2.45.2/src/YQMenuButton.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQMenuButton.cc 2014-03-11 11:22:35.000000000 +0100
@@ -86,8 +86,8 @@
_qt_button->setMenu( menu );
menu->setProperty( "class", "ymenubutton QMenu" );
- connect( menu, SIGNAL( triggered ( QAction * ) ),
- this, SLOT ( menuEntryActivated( QAction * ) ) );
+ connect( menu, &pclass(menu)::triggered,
+ this, &pclass(this)::menuEntryActivated );
//
// Recursively add Qt menu items from the YMenuItems
@@ -123,8 +123,8 @@
else
subMenu = parentMenu->addMenu( QIcon( icon ), fromUTF8( item->label() ));
- connect( subMenu, SIGNAL( triggered ( QAction * ) ),
- this, SLOT ( menuEntryActivated( QAction * ) ) );
+ connect( subMenu, &pclass(subMenu)::triggered,
+ this, &pclass(this)::menuEntryActivated );
rebuildMenuTree( subMenu, item->childrenBegin(), item->childrenEnd() );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQMultiLineEdit.cc new/libyui-qt-2.46.0/src/YQMultiLineEdit.cc
--- old/libyui-qt-2.45.2/src/YQMultiLineEdit.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQMultiLineEdit.cc 2014-03-11 11:22:35.000000000 +0100
@@ -63,8 +63,8 @@
_caption->setBuddy( _qt_textEdit );
- connect( _qt_textEdit, SIGNAL( textChanged( void ) ),
- this, SLOT ( changed ( void ) ) );
+ connect( _qt_textEdit, &pclass(_qt_textEdit)::textChanged,
+ this, &pclass(this)::changed );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQMultiSelectionBox.cc new/libyui-qt-2.46.0/src/YQMultiSelectionBox.cc
--- old/libyui-qt-2.45.2/src/YQMultiSelectionBox.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQMultiSelectionBox.cc 2014-03-11 11:22:35.000000000 +0100
@@ -75,14 +75,14 @@
// Very small default size if specified
- connect( _qt_listView, SIGNAL( itemSelectionChanged() ),
- this, SLOT ( slotSelected() ) );
+ connect( _qt_listView, &pclass(_qt_listView)::itemSelectionChanged,
+ this, &pclass(this)::slotSelected );
- connect( this, SIGNAL( valueChanged() ),
- this, SLOT ( slotValueChanged() ) );
+ connect( this, &pclass(this)::valueChanged,
+ this, &pclass(this)::slotValueChanged );
- connect( _qt_listView, SIGNAL( itemChanged( QTreeWidgetItem*, int ) ),
- this, SLOT ( slotItemChanged( QTreeWidgetItem*, int ) ) );
+ connect( _qt_listView, &pclass(_qt_listView)::itemChanged,
+ this, &pclass(this)::slotItemChanged );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQPartitionSplitter.cc new/libyui-qt-2.46.0/src/YQPartitionSplitter.cc
--- old/libyui-qt-2.45.2/src/YQPartitionSplitter.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQPartitionSplitter.cc 2014-03-11 11:22:35.000000000 +0100
@@ -106,11 +106,11 @@
// Connect signals
- connect( _newPartField, SIGNAL( valueChanged (int) ),
- this, SLOT ( setNewPartSizeSlot(int) ) );
+ connect( _newPartField, &pclass(_newPartField)::valueChanged,
+ this, &pclass(this)::setNewPartSizeSlot );
- connect( _freeSizeSlider, SIGNAL( valueChanged (int) ),
- this, SLOT ( setFreeSizeSlot(int) ) );
+ connect( _freeSizeSlider, &pclass(_freeSizeSlider)::valueChanged,
+ this, &pclass(this)::setFreeSizeSlot );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQPushButton.cc new/libyui-qt-2.46.0/src/YQPushButton.cc
--- old/libyui-qt-2.45.2/src/YQPushButton.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQPushButton.cc 2014-03-11 11:22:35.000000000 +0100
@@ -50,8 +50,8 @@
setMinimumSize( button->minimumSize()
+ 2 * QSize( YQButtonBorder, YQButtonBorder ) );
- connect( button, SIGNAL( clicked() ),
- this, SLOT ( hit() ) );
+ connect( button, &pclass(button)::clicked,
+ this, &pclass(this)::hit );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQRadioButton.cc new/libyui-qt-2.46.0/src/YQRadioButton.cc
--- old/libyui-qt-2.45.2/src/YQRadioButton.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQRadioButton.cc 2014-03-11 11:22:35.000000000 +0100
@@ -66,8 +66,8 @@
installEventFilter(this);
- connect ( this, SIGNAL( toggled ( bool ) ),
- this, SLOT ( changed ( bool ) ) );
+ connect ( this, &pclass(this)::toggled,
+ this, &pclass(this)::changed );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQRichText.cc new/libyui-qt-2.46.0/src/YQRichText.cc
--- old/libyui-qt-2.45.2/src/YQRichText.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQRichText.cc 2014-03-11 11:22:35.000000000 +0100
@@ -84,8 +84,8 @@
// Propagate clicks on hyperlinks
- connect( _textBrowser, SIGNAL( anchorClicked( const QUrl & ) ),
- this, SLOT ( linkClicked ( const QUrl & ) ) );
+ connect( _textBrowser, &pclass(_textBrowser)::anchorClicked,
+ this, &pclass(this)::linkClicked );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQSelectionBox.cc new/libyui-qt-2.46.0/src/YQSelectionBox.cc
--- old/libyui-qt-2.45.2/src/YQSelectionBox.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQSelectionBox.cc 2014-03-11 11:22:35.000000000 +0100
@@ -77,14 +77,14 @@
//FIXME _qt_listWidget->setTopItem(0);
_caption->setBuddy( _qt_listWidget );
- connect( _qt_listWidget, SIGNAL( itemSelectionChanged() ),
- this, SLOT ( slotSelectionChanged() ) );
+ connect( _qt_listWidget, &pclass(_qt_listWidget)::itemSelectionChanged,
+ this, &pclass(this)::slotSelectionChanged );
- connect( _qt_listWidget, SIGNAL( itemDoubleClicked( QListWidgetItem * ) ),
- this, SLOT ( slotActivated( QListWidgetItem * ) ) );
+ connect( _qt_listWidget, &pclass(_qt_listWidget)::itemDoubleClicked,
+ this, &pclass(this)::slotActivated );
- connect( &_timer, SIGNAL( timeout() ),
- this, SLOT ( returnImmediately() ) );
+ connect( &_timer, &pclass(&_timer)::timeout,
+ this, &pclass(this)::returnImmediately );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQSlider.cc new/libyui-qt-2.46.0/src/YQSlider.cc
--- old/libyui-qt-2.45.2/src/YQSlider.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQSlider.cc 2014-03-11 11:22:35.000000000 +0100
@@ -106,14 +106,14 @@
setValue( initialValue );
- connect( _qt_spinBox, SIGNAL( valueChanged(int) ),
- _qt_slider, SLOT ( setValue (int) ) );
+ connect( _qt_spinBox, static_cast(&QSpinBox::valueChanged),
+ _qt_slider, &pclass(_qt_slider)::setValue );
- connect( _qt_slider, SIGNAL( valueChanged(int) ),
- _qt_spinBox, SLOT ( setValue (int) ) );
+ connect( _qt_slider, &pclass(_qt_slider)::valueChanged,
+ _qt_spinBox, &pclass(_qt_spinBox)::setValue );
- connect( _qt_spinBox, SIGNAL( valueChanged (int) ),
- this, SLOT ( valueChangedSlot(int) ) );
+ connect( _qt_spinBox, static_cast(&QSpinBox::valueChanged),
+ this, &pclass(this)::valueChangedSlot );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQTable.cc new/libyui-qt-2.46.0/src/YQTable.cc
--- old/libyui-qt-2.45.2/src/YQTable.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQTable.cc 2014-03-11 11:22:35.000000000 +0100
@@ -85,22 +85,22 @@
// Connect signals and slots
//
- connect( _qt_listView, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int ) ),
- this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) );
+ connect( _qt_listView, &pclass(_qt_listView)::itemDoubleClicked,
+ this, &pclass(this)::slotActivated );
- connect( _qt_listView, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ),
- this, SLOT ( slotSelected ( QTreeWidgetItem * ) ) );
+ connect( _qt_listView, &pclass(_qt_listView)::currentItemChanged,
+ this, &pclass(this)::slotSelected );
- connect( _qt_listView, SIGNAL( customContextMenuRequested ( const QPoint & ) ),
- this, SLOT ( slotContextMenu ( const QPoint & ) ) );
+ connect( _qt_listView, &pclass(_qt_listView)::customContextMenuRequested,
+ this, &pclass(this)::slotContextMenu );
if ( multiSelectionMode )
{
// This is the exceptional case - avoid performance drop in the normal case
- connect( _qt_listView, SIGNAL( itemSelectionChanged() ),
- this, SLOT ( slotSelectionChanged() ) );
+ connect( _qt_listView, &pclass(_qt_listView)::itemSelectionChanged,
+ this, &pclass(this)::slotSelectionChanged );
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQTimezoneSelector.cc new/libyui-qt-2.46.0/src/YQTimezoneSelector.cc
--- old/libyui-qt-2.45.2/src/YQTimezoneSelector.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQTimezoneSelector.cc 2014-03-11 11:22:35.000000000 +0100
@@ -159,7 +159,8 @@
d->blink = new QTimer( this );
d->blink->setInterval( 200 );
- connect( d->blink, SIGNAL( timeout() ), SLOT( slotBlink() ) );
+ connect( d->blink, &pclass(d->blink)::timeout,
+ this, &pclass(this)::slotBlink );
d->highlight = 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQTree.cc new/libyui-qt-2.46.0/src/YQTree.cc
--- old/libyui-qt-2.45.2/src/YQTree.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQTree.cc 2014-03-11 11:22:35.000000000 +0100
@@ -79,29 +79,29 @@
_caption->setBuddy ( _qt_treeWidget );
- connect( _qt_treeWidget, SIGNAL( itemSelectionChanged () ),
- this, SLOT ( slotSelectionChanged () ) );
+ connect( _qt_treeWidget, &pclass(_qt_treeWidget)::itemSelectionChanged,
+ this, &pclass(this)::slotSelectionChanged );
- connect( _qt_treeWidget, SIGNAL( itemClicked ( QTreeWidgetItem *, int ) ),
- this, SLOT ( slotItemClicked ( QTreeWidgetItem *, int ) ) );
+ connect( _qt_treeWidget, &pclass(_qt_treeWidget)::itemClicked,
+ this, &pclass(this)::slotItemClicked );
-// connect( _qt_treeWidget, SIGNAL( itemChanged ( QTreeWidgetItem *, int ) ),
-// this, SLOT ( slotItemChanged () ) );
+// connect( _qt_treeWidget, &pclass(_qt_treeWidget)::itemChanged,
+// this, &pclass(this)::slotItemChanged );
- connect( _qt_treeWidget, SIGNAL( itemChanged ( QTreeWidgetItem *, int ) ),
- this, SLOT ( slotItemChanged (QTreeWidgetItem *) ) );
+ connect( _qt_treeWidget, &pclass(_qt_treeWidget)::itemChanged,
+ this, &pclass(this)::slotItemChanged );
- connect( _qt_treeWidget, SIGNAL( itemDoubleClicked( QTreeWidgetItem *, int ) ),
- this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) );
+ connect( _qt_treeWidget, &pclass(_qt_treeWidget)::itemDoubleClicked,
+ this, &pclass(this)::slotActivated );
- connect( _qt_treeWidget, SIGNAL( itemExpanded ( QTreeWidgetItem * ) ),
- this, SLOT ( slotItemExpanded ( QTreeWidgetItem * ) ) );
+ connect( _qt_treeWidget, &pclass(_qt_treeWidget)::itemExpanded,
+ this, &pclass(this)::slotItemExpanded );
- connect( _qt_treeWidget, SIGNAL( itemCollapsed ( QTreeWidgetItem * ) ),
- this, SLOT ( slotItemCollapsed( QTreeWidgetItem * ) ) );
+ connect( _qt_treeWidget, &pclass(_qt_treeWidget)::itemCollapsed,
+ this, &pclass(this)::slotItemCollapsed );
- connect( _qt_treeWidget, SIGNAL( customContextMenuRequested ( const QPoint & ) ),
- this, SLOT ( slotContextMenu ( const QPoint & ) ) );
+ connect( _qt_treeWidget, &pclass(_qt_treeWidget)::customContextMenuRequested,
+ this, &pclass(this)::slotContextMenu );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQUI.cc new/libyui-qt-2.46.0/src/YQUI.cc
--- old/libyui-qt-2.45.2/src/YQUI.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQUI.cc 2014-03-11 11:22:35.000000000 +0100
@@ -269,8 +269,8 @@
busyCursor();
- QObject::connect( _busyCursorTimer, SIGNAL( timeout() ),
- _signalReceiver, SLOT ( slotBusyCursor() ) );
+ QObject::connect( _busyCursorTimer, &pclass(_busyCursorTimer)::timeout,
+ _signalReceiver, &pclass(_signalReceiver)::slotBusyCursor );
yuiMilestone() << "YQUI initialized. Thread ID: 0x"
<< hex << QThread::currentThreadId () << dec
@@ -441,8 +441,8 @@
_received_ycp_command = false;
QSocketNotifier * notifier = new QSocketNotifier( fd_ycp, QSocketNotifier::Read );
- QObject::connect( notifier, SIGNAL( activated( int ) ),
- _signalReceiver, SLOT ( slotReceivedYCPCommand() ) );
+ QObject::connect( notifier, &pclass(notifier)::activated,
+ _signalReceiver, &pclass(_signalReceiver)::slotReceivedYCPCommand );
notifier->setEnabled( true );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQUI.h new/libyui-qt-2.46.0/src/YQUI.h
--- old/libyui-qt-2.45.2/src/YQUI.h 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQUI.h 2014-03-11 11:22:35.000000000 +0100
@@ -30,6 +30,7 @@
#include <QTimer>
#include <QPalette>
#include <vector>
+#include
#include
#include
@@ -39,6 +40,13 @@
#define YQWidgetSpacing 4
#define YQButtonBorder 3
+//! The class of a pointer expression.
+// To be used in connect(foo, &pclass(foo)::mysignal, bar, &pclass(bar)::myslot);
+// That checks types at compile time,
+// unlike the string based SIGNAL and SLOT macros.
+#define pclass(ptr) std::remove_reference::type
+
+
class QCursor;
class QFrame;
class QStackedWidget;
@@ -51,7 +59,6 @@
using std::string;
using std::vector;
-
class YQUI: public YUI
{
friend class YQUISignalReceiver;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQWizard.cc new/libyui-qt-2.46.0/src/YQWizard.cc
--- old/libyui-qt-2.45.2/src/YQWizard.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQWizard.cc 2014-03-11 11:22:35.000000000 +0100
@@ -560,11 +560,11 @@
_tree->setRootIsDecorated( true );
_tree->setSortByInsertionSequence( true );
- connect( _tree, SIGNAL( itemSelectionChanged ( void ) ),
- this, SLOT ( treeSelectionChanged ( void ) ) );
+ connect( _tree, &pclass(_tree)::itemSelectionChanged,
+ this, &pclass(this)::treeSelectionChanged );
- connect( _tree, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int ) ),
- this, SLOT ( sendTreeEvent ( QTreeWidgetItem * ) ) );
+ connect( _tree, &pclass(_tree)::itemDoubleClicked,
+ this, &pclass(this)::sendTreeEvent );
}
@@ -738,8 +738,8 @@
headingHBox->addWidget( _releaseNotesButton );
_releaseNotesButton->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum ) ); // hor/vert
- connect( _releaseNotesButton, SIGNAL( clicked() ),
- this, SLOT ( showReleaseNotes() ) );
+ connect( _releaseNotesButton, &pclass(_releaseNotesButton)::clicked,
+ this, &pclass(this)::showReleaseNotes );
_releaseNotesButton->hide(); // hidden until showReleaseNotesButton() is called
@@ -818,8 +818,8 @@
YUI_CHECK_NEW( _helpButton );
_helpButton->setShortcut( Qt::Key_F1 );
- connect( _helpButton, SIGNAL( clicked() ),
- this, SLOT ( showHelp() ) );
+ connect( _helpButton, &pclass(_helpButton)::clicked,
+ this, &pclass(this)::showHelp );
hbox->addWidget( _helpButton );
@@ -833,8 +833,8 @@
YUI_CHECK_NEW( _abortButton );
hbox->addWidget( (QWidget *) _abortButton->widgetRep() );
- connect( _abortButton, SIGNAL( clicked() ),
- this, SLOT ( slotAbortClicked() ) );
+ connect( _abortButton, &pclass(_abortButton)::clicked,
+ this, &pclass(this)::slotAbortClicked );
hbox->addSpacing( 10 );
@@ -846,8 +846,8 @@
YUI_CHECK_NEW( _backButton );
hbox->addWidget( (QWidget *) _backButton->widgetRep() );
- connect( _backButton, SIGNAL( clicked() ),
- this, SLOT ( slotBackClicked() ) );
+ connect( _backButton, &pclass(_backButton)::clicked,
+ this, &pclass(this)::slotBackClicked );
if ( _backButton->text().isEmpty() )
_backButton->hide();
@@ -862,8 +862,8 @@
YUI_CHECK_NEW( _nextButton );
hbox->addWidget( (QWidget *) _nextButton->widgetRep() );
- connect( _nextButton, SIGNAL( clicked() ),
- this, SLOT ( slotNextClicked() ) );
+ connect( _nextButton, &pclass(_nextButton)::clicked,
+ this, &pclass(this)::slotNextClicked );
return hbox;
}
@@ -1056,8 +1056,8 @@
_menuBar->addMenu( menu );
menu->setTitle( fromUTF8( text ) );
- connect( menu, SIGNAL( triggered ( QAction * ) ),
- this, SLOT ( sendMenuEvent( QAction * ) ) );
+ connect( menu, &pclass(menu)::triggered,
+ this, &pclass(this)::sendMenuEvent );
_menuBar->show();
}
@@ -1078,8 +1078,8 @@
_menuIDs.insert( fromUTF8( id ), menu );
//FIXME parentMenu->insertItem( fromUTF8( text ), menu );
- connect( menu, SIGNAL( triggered ( QAction * ) ),
- this, SLOT ( sendMenuEvent( QAction * ) ) );
+ connect( menu, &pclass(menu)::triggered,
+ this, &pclass(this)::sendMenuEvent );
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.45.2/src/YQWizardButton.cc new/libyui-qt-2.46.0/src/YQWizardButton.cc
--- old/libyui-qt-2.45.2/src/YQWizardButton.cc 2014-02-21 15:05:58.000000000 +0100
+++ new/libyui-qt-2.46.0/src/YQWizardButton.cc 2014-03-11 11:22:35.000000000 +0100
@@ -46,8 +46,8 @@
setQPushButton( button );
setWidgetRep( button );
- connect( button, SIGNAL( clicked() ),
- this, SIGNAL( clicked() ) );
+ connect( button, &pclass(button)::clicked,
+ this, &pclass(this)::clicked );
// This widget itself will never be visible, only its button - which is not
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org