Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit a1938788 authored by Laurent Montel's avatar Laurent Montel 😁 Committed by Pali Rohár

Use nullptr + clean up some deprecated include + fix ui

parent a096462a
......@@ -67,7 +67,7 @@
// KDE includes
#include <kactioncollection.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <kfiledialog.h>
#include <khtmlview.h>
#include <KLocalizedString>
......
......@@ -36,7 +36,7 @@
#include <kconfig.h>
#include <kcursor.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <kedittoolbar.h>
#include <kfontdialog.h>
#include <kcolorscheme.h>
......
......@@ -33,7 +33,7 @@
#include <QPixmap>
#include <QVBoxLayout>
#include <kdeversion.h>
#include <kcolorcombo.h>
#include <kcolorbutton.h>
......@@ -42,7 +42,6 @@
#include <kpluginfactory.h>
#include <kpluginloader.h>
#include <kio/netaccess.h>
#include <KHTMLView>
#include <QLineEdit>
#include <KLocalizedString>
#include <kmessagebox.h>
......
......@@ -30,10 +30,10 @@ class IdPushButton : public KPushButton
{
Q_OBJECT
public:
IdPushButton(unsigned int id, QWidget * parent = 0);
IdPushButton(unsigned int id, const QString text, QWidget * parent = 0);
IdPushButton(unsigned int id, const KIcon icon, const QString text, QWidget * parent = 0);
IdPushButton(unsigned int id, KGuiItem item, QWidget * parent = 0);
IdPushButton(unsigned int id, QWidget * parent = nullptr);
IdPushButton(unsigned int id, const QString text, QWidget * parent = nullptr);
IdPushButton(unsigned int id, const KIcon icon, const QString text, QWidget * parent = nullptr);
IdPushButton(unsigned int id, KGuiItem item, QWidget * parent = nullptr);
private:
unsigned int _id;
private slots:
......@@ -47,8 +47,8 @@ class IdComboBox : public KComboBox
{
Q_OBJECT
public:
IdComboBox(unsigned int id, QWidget * parent = 0);
IdComboBox(unsigned int id, bool rw, QWidget * parent = 0);
IdComboBox(unsigned int id, QWidget * parent = nullptr);
IdComboBox(unsigned int id, bool rw, QWidget * parent = nullptr);
private:
unsigned int _id;
private slots:
......@@ -62,8 +62,8 @@ class IdCheckBox : public QCheckBox
{
Q_OBJECT
public:
IdCheckBox(unsigned int id, QWidget * parent = 0);
IdCheckBox(unsigned int id, const QString & text, QWidget * parent = 0);
IdCheckBox(unsigned int id, QWidget * parent = nullptr);
IdCheckBox(unsigned int id, const QString & text, QWidget * parent = nullptr);
private:
unsigned int _id;
private slots:
......@@ -77,8 +77,8 @@ class IdSlider : public QSlider
{
Q_OBJECT
public:
IdSlider(unsigned int id, QWidget * parent = 0);
IdSlider(unsigned int id, Qt::Orientation orientation, QWidget * parent = 0);
IdSlider(unsigned int id, QWidget * parent = nullptr);
IdSlider(unsigned int id, Qt::Orientation orientation, QWidget * parent = nullptr);
private:
unsigned int _id;
private slots:
......
......@@ -32,7 +32,7 @@
#include <QPixmap>
#include <QVBoxLayout>
#include <kdeversion.h>
#include <kcolorcombo.h>
#include <kcolorbutton.h>
#include <kdebug.h>
......
......@@ -43,7 +43,7 @@ class KOPETE_CONTACT_LIST_EXPORT ContactListModel : public QAbstractItemModel
{
Q_OBJECT
public:
ContactListModel(QObject* parent = 0);
ContactListModel(QObject* parent = nullptr);
void init();
......
......@@ -42,7 +42,7 @@ class KOPETE_CONTACT_LIST_EXPORT ContactListPlainModel : public ContactListModel
{
Q_OBJECT
public:
ContactListPlainModel(QObject* parent = 0);
ContactListPlainModel(QObject* parent = nullptr);
~ContactListPlainModel();
virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
......
......@@ -37,7 +37,7 @@ class KOPETE_CONTACT_LIST_EXPORT ContactListProxyModel : public QSortFilterProxy
{
Q_OBJECT
public:
ContactListProxyModel(QObject* parent = 0);
ContactListProxyModel(QObject* parent = nullptr);
~ContactListProxyModel();
public slots:
......
......@@ -41,7 +41,7 @@ class KOPETE_CONTACT_LIST_EXPORT ContactListTreeModel : public ContactListModel
{
Q_OBJECT
public:
ContactListTreeModel(QObject* parent = 0);
ContactListTreeModel(QObject* parent = nullptr);
~ContactListTreeModel();
virtual bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole );
......
......@@ -35,7 +35,7 @@ class KOPETE_CONTACT_LIST_EXPORT KopeteItemDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
KopeteItemDelegate( QAbstractItemView* parent = 0 );
KopeteItemDelegate( QAbstractItemView* parent = nullptr );
~KopeteItemDelegate();
static QFont normalFont( const QFont& naturalFont );
......
......@@ -60,7 +60,7 @@
#include <kmenubar.h>
#include <kstatusbar.h>
#include <kwindowsystem.h>
#include <kdeversion.h>
#include <kplugininfo.h>
#include <ksqueezedtextlabel.h>
#include <kstringhandler.h>
......
......@@ -41,7 +41,7 @@ public:
/**
* Retrieve the system tray instance
*/
static KopeteSystemTray* systemTray( QWidget* parent = 0);
static KopeteSystemTray* systemTray( QWidget* parent = nullptr);
virtual ~KopeteSystemTray();
......
......@@ -34,7 +34,7 @@ class KOPETE_EXPORT ChatSessionMembersListModel : public QAbstractListModel
{
Q_OBJECT
public:
explicit ChatSessionMembersListModel(QObject * parent = 0);
explicit ChatSessionMembersListModel(QObject * parent = nullptr);
~ChatSessionMembersListModel();
......
......@@ -58,7 +58,7 @@ class KOPETE_EXPORT KABCPersistence : public QObject
*/
static KABCPersistence* self();
explicit KABCPersistence( QObject * parent = 0, const char * name = 0 );
explicit KABCPersistence( QObject * parent = nullptr, const char * name = 0 );
~KABCPersistence();
/**
* @brief Access Kopete's KDE address book instance
......
......@@ -36,7 +36,7 @@
#include <QVBoxLayout>
#include <kconfig.h>
#include <kdeversion.h>
#include <kiconeffect.h>
#include <kmessagebox.h>
#include <kmessagebox_queued.h>
......
......@@ -584,7 +584,7 @@ public slots:
/**
* Display the edit account widget for the account
*/
void editAccount( QWidget* parent = 0L );
void editAccount( QWidget* parent = nullptr );
/**
* Add a user to the blacklist. The default implementation calls
......
......@@ -28,7 +28,7 @@
#include <QPointer>
#include <kdebug.h>
#include <kdeversion.h>
#include <kglobal.h>
#include <KLocalizedString>
#include <kmessagebox.h>
......
......@@ -174,7 +174,7 @@ public slots:
void slotReadMessage();
private:
ChatSessionManager( QObject* parent = 0 );
ChatSessionManager( QObject* parent = nullptr );
class Private;
Private * const d;
......
......@@ -20,7 +20,7 @@
#include <qdom.h>
#include <QApplication>
#include <kdeversion.h>
#include <kxmlguiclient.h>
#include <kauthorized.h>
#include <kactioncollection.h>
......
......@@ -29,7 +29,7 @@
#include <QVariant>
#include <QWidget>
#include <kdeversion.h>
#include <kabcpersistence.h>
#include <kmessagebox.h>
#include <kmessagebox_queued.h>
......
......@@ -31,7 +31,7 @@
#include <KRandom>
#include <QMenu>
#include <kdeversion.h>
#include <KSharedConfig>
namespace Kopete
......
......@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <KLocalizedString>
#include <kdeversion.h>
#include <kmessagebox.h>
#include <knotification.h>
#include <kmessagebox_queued.h>
......
......@@ -23,7 +23,7 @@
#include <QStringList>
#include <KDebug>
#include <kdeversion.h>
namespace Kopete {
......
......@@ -45,7 +45,7 @@ class KOPETE_EXPORT AddressBookLinkWidget : public QWidget, private Ui::AddressB
{
Q_OBJECT
public:
explicit AddressBookLinkWidget( QWidget * parent = 0, const char * name = 0 );
explicit AddressBookLinkWidget( QWidget * parent = nullptr, const char * name = 0 );
~AddressBookLinkWidget() {}
/**
* Set the currently selected addressee
......
......@@ -30,7 +30,7 @@
#include <KLocalizedString>
#include <kiconloader.h>
#include <kdeversion.h>
#include <qinputdialog.h>
#include <QPushButton>
......
......@@ -36,7 +36,7 @@ class ClickableLabel : public QLabel
{
Q_OBJECT
public:
ClickableLabel( QWidget* parent = 0 );
ClickableLabel( QWidget* parent = nullptr );
~ClickableLabel();
void mouseReleaseEvent( QMouseEvent *e );
......
......@@ -23,7 +23,7 @@
#include <KLocalizedString>
#include <kdeversion.h>
#include <kguiitem.h>
#include <ksettings/dialog.h>
#include <kstandardaction.h>
......
......@@ -31,7 +31,7 @@
#include <KLocalizedString>
#include <kiconloader.h>
#include <kdeversion.h>
#include <QPushButton>
#include <kdebug.h>
#include <QTreeWidget>
......
......@@ -36,7 +36,7 @@ public:
* @brief WebcamWidget constructor.
* @param parent The parent widget of this widget
*/
WebcamWidget(QWidget* parent = 0);
WebcamWidget(QWidget* parent = nullptr);
~WebcamWidget();
/**
......
......@@ -59,7 +59,7 @@ AutoReplacePreferences::AutoReplacePreferences( QWidget *parent, const QVariantL
SLOT(slotEditCouple()) );
connect( preferencesDialog->m_remove, SIGNAL(pressed()),
SLOT(slotRemoveCouple()) );
connect( preferencesDialog->m_list, SIGNAL(selectionChanged()),
connect( preferencesDialog->m_list, SIGNAL(itemSelectionChanged()),
SLOT(slotSelectionChanged()) );
connect( preferencesDialog->m_key, SIGNAL(textChanged(QString)),
SLOT(slotEnableAddEdit(QString)) );
......
This diff is collapsed.
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>Duncan Mac-Vicar</author>
<class>LatexPrefsUI</class>
<widget class="QWidget" name="LatexPrefsUI" >
<property name="geometry" >
<widget class="QWidget" name="LatexPrefsUI">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
......@@ -10,64 +11,76 @@
<height>437</height>
</rect>
</property>
<layout class="QVBoxLayout" >
<layout class="QVBoxLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="textLabel1" >
<property name="frameShape" >
<widget class="QLabel" name="textLabel1">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="text" >
<property name="text">
<string>The KopeteTeX plugin allows Kopete to render LaTeX formulas in the chat window. The sender must enclose the formula between two pairs of $ signs. ie: $$formula$$
This plugin requires that the ImageMagick convert program be installed in order to work.</string>
</property>
<property name="wordWrap" >
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Options</string>
</property>
<layout class="QHBoxLayout" >
<layout class="QHBoxLayout">
<item>
<layout class="QVBoxLayout" >
<layout class="QVBoxLayout">
<item>
<layout class="QHBoxLayout" >
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="textLabel4" >
<property name="text" >
<widget class="QLabel" name="textLabel4">
<property name="text">
<string>LaTeX include file:</string>
</property>
</widget>
</item>
<item>
<widget class="KUrlRequester" name="includeUrlRequester" />
<widget class="KUrlRequester" name="includeUrlRequester"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="textLabel2" >
<property name="text" >
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Rendering resolution (DPI):</string>
</property>
</widget>
</item>
<item>
<widget class="KIntNumInput" name="horizontalDPI" />
<widget class="KIntNumInput" name="horizontalDPI"/>
</item>
<item>
<widget class="QLabel" name="textLabel3" >
<property name="text" >
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>x</string>
</property>
</widget>
</item>
<item>
<widget class="KIntNumInput" name="verticalDPI" />
<widget class="KIntNumInput" name="verticalDPI"/>
</item>
</layout>
</item>
......@@ -75,10 +88,10 @@ This plugin requires that the ImageMagick convert program be installed in order
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
......@@ -91,10 +104,10 @@ This plugin requires that the ImageMagick convert program be installed in order
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
......@@ -104,7 +117,7 @@ This plugin requires that the ImageMagick convert program be installed in order
</item>
</layout>
</widget>
<customwidgets>
<customwidgets>
<customwidget>
<class>KIntNumInput</class>
<extends>QWidget</extends>
......@@ -112,7 +125,7 @@ This plugin requires that the ImageMagick convert program be installed in order
</customwidget>
<customwidget>
<class>KUrlRequester</class>
<extends>QFrame</extends>
<extends>QWidget</extends>
<header>kurlrequester.h</header>
</customwidget>
</customwidgets>
......
......@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kdeversion.h>
#include <time.h>
......
......@@ -29,7 +29,7 @@
#include <kactioncollection.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kdeversion.h>
#include <kapplication.h>
#include "kopetechatsessionmanager.h"
......
......@@ -30,7 +30,7 @@
#include <kgenericfactory.h>
#include <kdebug.h>
#include <kdeversion.h>
#include "ui_texteffectprefs.h"
#include "texteffectconfig.h"
......
......@@ -31,7 +31,7 @@ class URLPicPreviewPreferences : public KCModule
URLPicPreviewPreferences& operator= ( const URLPicPreviewPreferences& );
public:
explicit URLPicPreviewPreferences ( QWidget* parent = 0, const QVariantList& args = QVariantList() );
explicit URLPicPreviewPreferences ( QWidget* parent = nullptr, const QVariantList& args = QVariantList() );
virtual ~URLPicPreviewPreferences();
virtual void load();
......
......@@ -55,14 +55,12 @@ endif(WITH_wlm AND LIBMSN_FOUND AND Boost_FOUND)
if(WITH_oscar)
add_subdirectory( oscar )
endif(WITH_oscar)
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: WARNING: Disable yahoo plugin")
#if(WITH_yahoo AND JASPER_FOUND)
# add_subdirectory( yahoo )
#endif(WITH_yahoo AND JASPER_FOUND)
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: WARNING: qq plugin disabled")
#if(WITH_qq)
# add_subdirectory( qq )
#endif(WITH_qq)
if(WITH_yahoo AND JASPER_FOUND)
add_subdirectory( yahoo )
endif(WITH_yahoo AND JASPER_FOUND)
if(WITH_qq)
add_subdirectory( qq )
endif(WITH_qq)
if(WITH_irc)
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: WARNING: Building the irc plugin, even if it hasn't been completely ported yet")
add_subdirectory( irc )
......
......@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <KLocalizedString>
#include <kactionmenu.h>
#include <kmenu.h>
#include <kmessagebox.h>
#include "kopetemetacontact.h"
......
......@@ -35,7 +35,7 @@ class BonjourAddContactPage : public AddContactPage
{
Q_OBJECT
public:
BonjourAddContactPage( QWidget* parent = 0 );
BonjourAddContactPage( QWidget* parent = nullptr );
~BonjourAddContactPage();
/**
......
......@@ -31,7 +31,7 @@ class JabberFormLineEdit:public QLineEdit
{
Q_OBJECT public:
JabberFormLineEdit (const int type, const QString & realName, const QString & value, QWidget * parent = 0);
JabberFormLineEdit (const int type, const QString & realName, const QString & value, QWidget * parent = nullptr);
~JabberFormLineEdit ();
public slots:void slotGatherData (XMPP::Form & form);
......
......@@ -33,7 +33,7 @@ class JabberFormTranslator:public QWidget
Q_OBJECT
public:
explicit JabberFormTranslator (const XMPP::Form & form, QWidget * parent = 0);
explicit JabberFormTranslator (const XMPP::Form & form, QWidget * parent = nullptr);
~JabberFormTranslator ();
XMPP::Form & resultData ();
......
......@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <KLocalizedString>
#include <kmenu.h>
#include <QMenu>
#include <kactionmenu.h>
#include <kactioncollection.h>
#include "kopetechatsessionmanager.h"
......
......@@ -29,7 +29,7 @@ class dlgJabberChatJoin : public KDialog
Q_OBJECT
public:
explicit dlgJabberChatJoin(JabberAccount *account, QWidget* parent = 0);
explicit dlgJabberChatJoin(JabberAccount *account, QWidget* parent = nullptr);
~dlgJabberChatJoin();
/*$PUBLIC_FUNCTIONS$*/
......
......@@ -25,7 +25,7 @@ class dlgJabberChatRoomsList : public KDialog
Q_OBJECT
public:
explicit dlgJabberChatRoomsList(JabberAccount* account, const QString& server = QString(), const QString& nick = QString(), QWidget* parent = 0);
explicit dlgJabberChatRoomsList(JabberAccount* account, const QString& server = QString(), const QString& nick = QString(), QWidget* parent = nullptr);
~dlgJabberChatRoomsList();
/*$PUBLIC_FUNCTIONS$*/
......
......@@ -54,7 +54,7 @@ public:
* @param widget Parent widget.
* @param name widget name.
*/
dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, QWidget * parent = 0);
dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, QWidget * parent = nullptr);
~dlgJabberVCard ();
private slots:
......
......@@ -34,7 +34,7 @@ class JabberAddContactPage:public AddContactPage
Q_OBJECT
public:
explicit JabberAddContactPage (Kopete::Account * owner, QWidget * parent = 0);
explicit JabberAddContactPage (Kopete::Account * owner, QWidget * parent = nullptr);
~JabberAddContactPage ();
virtual bool validateData ();
virtual bool apply (Kopete::Account *, Kopete::MetaContact *);
......
......@@ -40,7 +40,7 @@ class JabberEditAccountWidget: public QWidget, public Ui::DlgJabberEditAccountWi
Q_OBJECT
public:
JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, QWidget * parent = 0);
JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, QWidget * parent = nullptr);
~JabberEditAccountWidget ();
virtual bool validateData ();
virtual Kopete::Account *apply ();
......
......@@ -21,7 +21,7 @@
#include <kconfig.h>
#include <kdialog.h>
#include <KLocalizedString>
#include <kmenu.h>
#include <kactionmenu.h>
#include <kmessagebox.h>
#include <ktoggleaction.h>
......
......@@ -31,7 +31,7 @@ class AIMJoinChatUI : public KDialog
{
Q_OBJECT
public:
explicit AIMJoinChatUI( AIMAccount*, QWidget* parent = 0 );
explicit AIMJoinChatUI( AIMAccount*, QWidget* parent = nullptr );
~AIMJoinChatUI();
void setExchangeList( const QList<int>& );
......
......@@ -21,7 +21,7 @@
#include <kconfig.h>
#include <kdebug.h>