diff --git a/src/approverdaemon.h b/src/approverdaemon.h index 4d41414..d6caf28 100644 --- a/src/approverdaemon.h +++ b/src/approverdaemon.h @@ -1,34 +1,34 @@ /* Copyright (C) 2010 Collabora Ltd. @author George Kiagiadakis This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ #ifndef APPROVERDAEMON_H #define APPROVERDAEMON_H #include class ApproverDaemon : public QObject, public Tp::AbstractClientApprover { Q_OBJECT public: ApproverDaemon(QObject *parent = 0); protected: - virtual void addDispatchOperation(const Tp::MethodInvocationContextPtr<> & context, - const Tp::ChannelDispatchOperationPtr & dispatchOperation); + void addDispatchOperation(const Tp::MethodInvocationContextPtr<> & context, + const Tp::ChannelDispatchOperationPtr & dispatchOperation) override; }; #endif // APPROVERDAEMON_H diff --git a/src/channelapprover.h b/src/channelapprover.h index 5846249..b6dad8a 100644 --- a/src/channelapprover.h +++ b/src/channelapprover.h @@ -1,40 +1,38 @@ /* Copyright (C) 2010 Collabora Ltd. @author George Kiagiadakis This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ #ifndef CHANNELAPPROVER_H #define CHANNELAPPROVER_H #include #include class ChannelApprover : public QObject { Q_OBJECT public: static ChannelApprover *create(const Tp::ChannelPtr & channel, QObject *parent); - virtual ~ChannelApprover() {} - Q_SIGNALS: void channelAccepted(); void channelRejected(); protected: inline ChannelApprover(QObject *parent) : QObject(parent) {} }; #endif // CHANNELAPPROVER_H diff --git a/src/dispatchoperation.h b/src/dispatchoperation.h index 8808d42..ecb6a71 100644 --- a/src/dispatchoperation.h +++ b/src/dispatchoperation.h @@ -1,50 +1,50 @@ /* Copyright (C) 2010 Collabora Ltd. @author George Kiagiadakis This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ #ifndef DISPATCHOPERATION_H #define DISPATCHOPERATION_H #include #include class ChannelApprover; class DispatchOperation : public QObject { Q_OBJECT public: DispatchOperation(const Tp::ChannelDispatchOperationPtr & dispatchOperation, QObject *parent); - virtual ~DispatchOperation(); + ~DispatchOperation() override; private Q_SLOTS: void onChannelLost(const Tp::ChannelPtr & channel, const QString & errorName, const QString & errorMessage); void onDispatchOperationInvalidated(Tp::DBusProxy *proxy, const QString & errorName, const QString & errorMessage); void onChannelAccepted(); void onChannelRejected(); void onClaimFinished(Tp::PendingOperation *operation); private: Tp::ChannelDispatchOperationPtr m_dispatchOperation; QHash m_channelApprovers; }; #endif // DISPATCHOPERATION_H diff --git a/src/filetransferchannelapprover.h b/src/filetransferchannelapprover.h index a8c13d5..c198272 100644 --- a/src/filetransferchannelapprover.h +++ b/src/filetransferchannelapprover.h @@ -1,40 +1,40 @@ /* Copyright (C) 2010-2011 Collabora Ltd. @author George Kiagiadakis This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ #ifndef FILETRANSFERCHANNELAPPROVER_H #define FILETRANSFERCHANNELAPPROVER_H #include "channelapprover.h" #include #include class KStatusNotifierItem; class KNotification; class FileTransferChannelApprover : public ChannelApprover { Q_OBJECT public: FileTransferChannelApprover(const Tp::FileTransferChannelPtr & channel, QObject *parent); - virtual ~FileTransferChannelApprover(); + ~FileTransferChannelApprover() override; private: QPointer m_notification; KStatusNotifierItem *m_notifierItem; }; #endif //FILETRANSFERCHANNELAPPROVER_H diff --git a/src/textchannelapprover.h b/src/textchannelapprover.h index 3cc302c..2464876 100644 --- a/src/textchannelapprover.h +++ b/src/textchannelapprover.h @@ -1,48 +1,48 @@ /* Copyright (C) 2010 Collabora Ltd. @author George Kiagiadakis This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ #ifndef TEXTCHANNELAPPROVER_H #define TEXTCHANNELAPPROVER_H #include "channelapprover.h" #include #include #include #include class KStatusNotifierItem; class KNotification; class TextChannelApprover : public ChannelApprover { Q_OBJECT public: TextChannelApprover(const Tp::TextChannelPtr & channel, QObject *parent); - virtual ~TextChannelApprover(); + ~TextChannelApprover() override; private Q_SLOTS: void onMessageReceived(const Tp::ReceivedMessage & msg); private: static QSharedPointer getNotifierItem(); void updateNotifierItemTooltip(); QPointer m_notification; QSharedPointer m_notifierItem; }; #endif //TEXTCHANNELAPPROVER_H diff --git a/src/tubechannelapprover.h b/src/tubechannelapprover.h index 451a6cc..31c3562 100644 --- a/src/tubechannelapprover.h +++ b/src/tubechannelapprover.h @@ -1,54 +1,54 @@ /* Copyright (C) 2012 David Edmundson Copyright (C) 2013 Dan Vrátil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ #ifndef TUBECHANNELAPPROVER_H #define TUBECHANNELAPPROVER_H #include "channelapprover.h" #include #include #include #include class KStatusNotifierItem; class TubeChannelApprover : public ChannelApprover { Q_OBJECT public: TubeChannelApprover(const Tp::TubeChannelPtr &channel, QObject* parent); - virtual ~TubeChannelApprover(); + ~TubeChannelApprover() override; private Q_SLOTS: void onChannelAccepted(); void onChannelCloseRequested(); void onChannelInvalidated(); private: void showNotification(const QString &title, const QString &comment, const QString &icon, const Tp::ContactPtr &sender); Tp::TubeChannelPtr m_channel; QPointer m_notification; KStatusNotifierItem *m_notifierItem; KService::Ptr m_service; }; #endif // TUBECHANNELAPPROVER_H