Commit a056d8c0 authored by David Faure's avatar David Faure

Merge remote-tracking branch 'origin/1.7'

parents 271da4bd 132b8bd0
......@@ -50,6 +50,7 @@
#include <KTextEdit>
#include <KSharedConfig>
#include <KStartupInfo>
#include <kwindowsystem_version.h>
using namespace Konversation;
......
......@@ -86,7 +86,7 @@ class Application : public QApplication
QStandardItemModel* getUrlModel() { return m_urlModel; }
Application(int &argc, char **argv);
~Application();
~Application() override;
static Application* instance();
......
......@@ -34,7 +34,7 @@ class KonviBookmarkHandler : public QObject, public KBookmarkOwner
public:
explicit KonviBookmarkHandler(QMenu *menu, MainWindow* mainWindow);
~KonviBookmarkHandler();
~KonviBookmarkHandler() override;
// KBookmarkOwner interface:
void openBookmark(const KBookmark &bm, Qt::MouseButtons mb, Qt::KeyboardModifiers km) Q_DECL_OVERRIDE;
......
......@@ -23,7 +23,7 @@ class Autoreplace_Config : public QWidget, public KonviSettingsPage, private Ui:
public:
explicit Autoreplace_Config(QWidget* parent, const char* name=NULL);
~Autoreplace_Config();
~Autoreplace_Config() override;
void saveSettings() Q_DECL_OVERRIDE;
void loadSettings() Q_DECL_OVERRIDE;
......
......@@ -110,7 +110,7 @@ public:
* Deletes private class.
* @see exists()
*/
~ConfigDialog();
~ConfigDialog() override;
/**
* Adds page to the dialog and to KConfigDialogManager. When an
......
......@@ -22,7 +22,7 @@ class DCC_Config : public QWidget, private Ui::DCC_ConfigUI
public:
DCC_Config(QWidget* parent, const char* name);
~DCC_Config();
~DCC_Config() override;
protected Q_SLOTS:
virtual void languageChange();
......
......@@ -47,7 +47,7 @@ class Preferences : public PreferencesBase
public:
static Preferences *self();
~Preferences();
~Preferences() override;
enum Pages
{
NotifyPage,
......
......@@ -23,7 +23,7 @@ class QuickButtons_Config : public QWidget, public KonviSettingsPage, private Ui
public:
explicit QuickButtons_Config(QWidget* parent, const char* name=NULL);
~QuickButtons_Config();
~QuickButtons_Config() override;
void saveSettings() Q_DECL_OVERRIDE;
void loadSettings() Q_DECL_OVERRIDE;
......
......@@ -38,7 +38,7 @@ class KonviSettingsDialog : public ConfigDialog
public:
explicit KonviSettingsDialog(QWidget *parent);
~KonviSettingsDialog();
~KonviSettingsDialog() override;
protected Q_SLOTS:
void updateSettings() Q_DECL_OVERRIDE;
......
......@@ -27,7 +27,7 @@ class Theme_Config : public QWidget, public KonviSettingsPage, private Ui::Theme
public:
explicit Theme_Config(QWidget* parent, const char* name=NULL);
~Theme_Config();
~Theme_Config() override;
void restorePageToDefaults() Q_DECL_OVERRIDE;
void saveSettings() Q_DECL_OVERRIDE;
......
......@@ -51,7 +51,7 @@ namespace Konversation
};
explicit Chat(QObject *parent);
~Chat();
~Chat() override;
quint16 ownPort() const;
QString ownNick() const;
......
......@@ -31,7 +31,7 @@ namespace Konversation
public:
ChatContainer(QWidget *parent, Chat *chat);
~ChatContainer();
~ChatContainer() override;
// ChatWindow
bool closeYourself(bool askForConfirmation=true) Q_DECL_OVERRIDE;
......
......@@ -34,7 +34,7 @@ namespace Konversation
public:
RecipientDialog(QWidget* parent, QAbstractListModel* model);
~RecipientDialog();
~RecipientDialog() override;
static QString getNickname(QWidget* parent, QAbstractListModel* model);
......
......@@ -41,7 +41,7 @@ namespace Konversation
RA_OverwriteDefaultPath = 1 << 4
};
virtual ~ResumeDialog();
~ResumeDialog() override;
static ReceiveAction ask(TransferRecv* item, const QString& message, int enabledActions, ReceiveAction defaultAction);
......
......@@ -64,7 +64,7 @@ namespace Konversation
};
Transfer(Type dccType, QObject *parent);
virtual ~Transfer();
~Transfer() override;
Type getType() const;
Status getStatus() const;
......
......@@ -45,7 +45,7 @@ namespace Konversation
public:
explicit TransferPanel(QWidget *parent);
~TransferPanel();
~TransferPanel() override;
TransferView *getTransferView();
......
......@@ -48,7 +48,7 @@ namespace Konversation
public:
explicit TransferRecv(QObject *parent);
virtual ~TransferRecv();
~TransferRecv() override;
// REQUIRED
void setPartnerIp(const QString &ip);
......@@ -152,7 +152,7 @@ namespace Konversation
public:
explicit TransferRecvWriteCacheHandler(KIO::TransferJob *transferJob);
virtual ~TransferRecvWriteCacheHandler();
~TransferRecvWriteCacheHandler() override;
void append(char *data, int size);
bool write(bool force = false);
......
......@@ -40,7 +40,7 @@ namespace Konversation
public:
explicit TransferSend(QObject *parent);
virtual ~TransferSend();
~TransferSend() override;
// REQUIRED
void setFileURL(const QUrl &url);
......
......@@ -29,7 +29,7 @@ namespace Konversation
public:
explicit WhiteBoard(QWidget* parent);
~WhiteBoard();
~WhiteBoard() override;
static QStringList whiteboardCommands();
......
......@@ -30,7 +30,7 @@ namespace Konversation
public:
explicit WhiteBoardFontChooser(QWidget* parent);
~WhiteBoardFontChooser();
~WhiteBoardFontChooser() override;
QFont font() const;
int textStyle() const;
......
......@@ -41,7 +41,7 @@ namespace Konversation
};
explicit WhiteBoardToolBar(QWidget* parent);
~WhiteBoardToolBar();
~WhiteBoardToolBar() override;
QColor foregroundColor() const;
QColor backgroundColor() const;
......
......@@ -72,7 +72,7 @@ class Channel : public ChatWindow
public:
explicit Channel(QWidget* parent, const QString& name);
~Channel();
~Channel() override;
//META
bool canBeFrontView() Q_DECL_OVERRIDE;
......
......@@ -85,7 +85,7 @@ class ChannelListPanel : public ChatWindow, private Ui::ChannelListWidgetUI
public:
explicit ChannelListPanel(QWidget* parent);
~ChannelListPanel();
~ChannelListPanel() override;
using ChatWindow::closeYourself;
virtual bool closeYourself();
......
......@@ -29,7 +29,7 @@ class InputFilter : public QObject
public:
InputFilter();
~InputFilter();
~InputFilter() override;
void setServer(Server* newServer);
void parseLine(const QString &line);
......
......@@ -96,7 +96,7 @@ public:
};
IRCQueue(Server *server, EmptyingRate& rate, int myindex=0);
~IRCQueue();
~IRCQueue() override;
void enqueue(const QString& line);
void reset();
......
......@@ -23,7 +23,7 @@ class ModeButton : public QToolButton
public:
ModeButton(const QString& label,QWidget* parent,int id);
~ModeButton();
~ModeButton() override;
void setOn(bool state);
......
......@@ -47,7 +47,7 @@ class NicksOnline : public ChatWindow
};
explicit NicksOnline(QWidget* parent);
~NicksOnline();
~NicksOnline() override;
// These are here for the benefit of NicksOnlineTooltip.
QTreeWidget* getNickListView();
......
......@@ -66,7 +66,7 @@ namespace Konversation
public:
explicit OutputFilter(Server* server);
~OutputFilter();
~OutputFilter() override;
static const QSet<QString>& supportedCommands() { return m_commands; }
......
......@@ -35,7 +35,7 @@ class OutputFilterResolveJob : public QObject
public:
explicit OutputFilterResolveJob(const Konversation::OutputFilterInput& input);
~OutputFilterResolveJob();
~OutputFilterResolveJob() override;
private Q_SLOTS:
......
......@@ -44,7 +44,7 @@ class Query : public ChatWindow
explicit Query(QWidget* parent, const QString& _name);
void setServer(Server* newServer) Q_DECL_OVERRIDE;
~Query();
~Query() override;
/** This will always be called soon after this object is created.
* @param nickInfo A nickinfo that must exist.
......
......@@ -108,7 +108,7 @@ class Server : public QObject
Q_DECLARE_FLAGS(CapabilityFlags, CapabilityFlag)
Server(QObject* parent, ConnectionSettings& settings);
~Server();
~Server() override;
void cycle();
void abortScheduledRecreation() { m_recreationScheduled = false; }
......
......@@ -25,7 +25,7 @@ class ServerListView : public QTreeWidget
public:
explicit ServerListView(QWidget *parent);
~ServerListView();
~ServerListView() override;
private:
bool badDropSelection();
......
......@@ -27,7 +27,7 @@ class KonsolePanel : public ChatWindow
public:
explicit KonsolePanel(QWidget *p);
~KonsolePanel();
~KonsolePanel() override;
void setName(const QString& newName) Q_DECL_OVERRIDE { ChatWindow::setName(newName); }
......
......@@ -44,7 +44,7 @@ class MainWindow : public KXmlGuiWindow
public:
MainWindow();
~MainWindow();
~MainWindow() override;
ViewContainer* getViewContainer() { return m_viewContainer; }
Konversation::TrayIcon* systemTrayIcon() const { return m_trayIcon; }
......
......@@ -30,7 +30,7 @@ class QuickConnectDialog : public QDialog
public:
explicit QuickConnectDialog(QWidget* parent=0);
~QuickConnectDialog();
~QuickConnectDialog() override;
Q_SIGNALS:
void connectClicked(Konversation::ConnectionFlag flag,
......
......@@ -23,7 +23,7 @@ class ScriptLauncher : public QObject
public:
explicit ScriptLauncher(QObject* parent);
~ScriptLauncher();
~ScriptLauncher() override;
static QString scriptPath(const QString& script);
......
......@@ -31,7 +31,7 @@ namespace Konversation
public:
explicit StatusBar(MainWindow* parent);
~StatusBar();
~StatusBar() override;
public Q_SLOTS:
void updateAppearance();
......
......@@ -37,7 +37,7 @@ namespace Konversation
QStack<Status> status_stack;
public:
XMLContentHandler(UPnPRouter* router);
virtual ~XMLContentHandler();
~XMLContentHandler() override;
bool startDocument() Q_DECL_OVERRIDE;
......
......@@ -36,7 +36,7 @@ namespace Konversation
Q_OBJECT
public:
UPnPMCastSocket();
virtual ~UPnPMCastSocket();
~UPnPMCastSocket() override;
/// Get the number of routers discovered
quint32 getNumDevicesDiscovered() const {return routers.count();}
......
......@@ -124,7 +124,7 @@ namespace Konversation
* @param verbose Print lots of debug info
*/
UPnPRouter(const QString & server,const QUrl &location,const QString & uuid);
virtual ~UPnPRouter();
~UPnPRouter() override;
/// Get the name of the server
QString getServer() const {return server;}
......
......@@ -31,7 +31,7 @@ namespace Konversation
Q_OBJECT
public:
explicit ChannelOptionsDialog(Channel *channel);
~ChannelOptionsDialog();
~ChannelOptionsDialog() override;
QString topic();
QStringList modes();
......
......@@ -31,7 +31,7 @@ class ChatWindow : public QWidget
public:
explicit ChatWindow(QWidget* parent);
~ChatWindow();
~ChatWindow() override;
enum WindowType
{
......
......@@ -35,7 +35,7 @@ class EditNotifyDialog : public QDialog
public:
explicit EditNotifyDialog(QWidget* parent=0, int serverGroupId=0,
const QString& nickname=QString());
~EditNotifyDialog();
~EditNotifyDialog() override;
Q_SIGNALS:
void notifyChanged(int serverGroupId,
......
......@@ -27,7 +27,7 @@ class HighlightViewItem : public QTreeWidgetItem
{
public:
HighlightViewItem(QTreeWidget* parent, Highlight* highlight);
~HighlightViewItem();
~HighlightViewItem() override;
void setID(const int itemID);
int getID() const;
......
......@@ -23,7 +23,7 @@ class IgnoreListViewItem : public QTreeWidgetItem
{
public:
IgnoreListViewItem(QTreeWidget* parent, const QString& name, int flags);
~IgnoreListViewItem();
~IgnoreListViewItem() override;
void setFlag(int flag,bool active);
bool getFlag(int flag) { return m_flags & flag; };
......
......@@ -42,7 +42,7 @@ class Images : public QObject
};
Images();
virtual ~Images();
~Images() override;
QIcon getLed(const QColor& col, bool state = true);
......
......@@ -70,7 +70,7 @@ class IrcContextMenus : public QObject
};
Q_DECLARE_FLAGS(MenuOptions, MenuOption)
~IrcContextMenus();
~IrcContextMenus() override;
static IrcContextMenus* self();
......
......@@ -25,7 +25,7 @@ class IRCInput : public KTextEdit
public:
explicit IRCInput(QWidget* parent);
~IRCInput();
~IRCInput() override;
void setCompletionMode(char mode);
char getCompletionMode();
......
......@@ -318,7 +318,7 @@ struct Burr: public QTextBlockUserData
m_prev->m_next = this;
}
~Burr()
~Burr() override
{
m_owner->blockDeleted(this);
unlink();
......
......@@ -64,7 +64,7 @@ class IRCView : public QTextBrowser
public:
explicit IRCView(QWidget* parent);
~IRCView();
~IRCView() override;
//! this function is proper given it is not nessary for the ircview to have a server for DCC.
void setServer(Server* server);
......
......@@ -24,7 +24,7 @@ class IRCViewBox : public QWidget
public:
explicit IRCViewBox(QWidget* parent);
~IRCViewBox();
~IRCViewBox() override;
IRCView* ircView() const;
......
......@@ -30,7 +30,7 @@ class LogfileReader : public ChatWindow
public:
LogfileReader(QWidget* parent, const QString& log, const QString& caption);
~LogfileReader();
~LogfileReader() override;
using ChatWindow::closeYourself;
virtual bool closeYourself() { closeLog(); return true; }
......
......@@ -27,7 +27,7 @@ class PasteEditor : public QDialog, private Ui::PasteEditor
Q_OBJECT
public:
explicit PasteEditor(QWidget* parent);
~PasteEditor();
~PasteEditor() override;
void setText(const QString& text);
QString text() const;
......
......@@ -23,7 +23,7 @@ class QuickButton : public QPushButton
public:
QuickButton(const QString &label,const QString &newDefinition,QWidget* parent);
~QuickButton();
~QuickButton() override;
void setDefinition(const QString &newDefinition);
......
......@@ -26,7 +26,7 @@ class RawLog : public ChatWindow
enum MessageDirection { Inbound, Outbound };
explicit RawLog(QWidget* parent);
~RawLog();
~RawLog() override;
using ChatWindow::closeYourself;
virtual bool closeYourself();
......
......@@ -28,7 +28,7 @@ class SearchBar : public QWidget, private Ui::SearchBarBase
public:
explicit SearchBar(QWidget* parent);
~SearchBar();
~SearchBar() override;
void setHasMatch(bool value);
......
......@@ -28,7 +28,7 @@ class StatusPanel : public ChatWindow
public:
explicit StatusPanel(QWidget* parent);
~StatusPanel();
~StatusPanel() override;
void cycle() Q_DECL_OVERRIDE;
......
......@@ -49,7 +49,7 @@ class ViewMimeData : public QMimeData
{
public:
explicit ViewMimeData(ChatWindow *view);
~ViewMimeData();
~ViewMimeData() override;
ChatWindow* view() const;
......@@ -86,7 +86,7 @@ class ViewContainer : public QAbstractItemModel
};
explicit ViewContainer(MainWindow* window);
~ViewContainer();
~ViewContainer() override;
QSplitter* getWidget() { return m_viewTreeSplitter; }
MainWindow* getWindow() { return m_window; }
......
......@@ -32,7 +32,7 @@ class ViewSpringLoader : public QObject
public:
explicit ViewSpringLoader(ViewContainer* viewContainer);
~ViewSpringLoader();
~ViewSpringLoader() override;
void addWidget(QWidget* widget);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment