From 7de8aed0e6497b4d60c07047fee488690cb2bf00 Mon Sep 17 00:00:00 2001 From: IceN9ne Date: Tue, 27 Nov 2018 21:38:17 -0500 Subject: Remove unnecessary usages of the inline keyword per language evolution. --- src/modules/aliaseditor/AliasEditorWindow.h | 14 +++++++------- src/modules/dcc/DccVideoWindow.h | 2 +- src/modules/list/ListWindow.h | 2 +- src/modules/notifier/NotifierMessage.h | 4 ++-- src/modules/notifier/NotifierWindow.cpp | 2 +- src/modules/notifier/NotifierWindow.h | 6 +++--- src/modules/notifier/NotifierWindowBorder.h | 22 +++++++++++----------- src/modules/notifier/NotifierWindowTab.h | 4 ++-- src/modules/objects/KvsObject_list.cpp | 2 +- src/modules/options/OptionsWidget_message.h | 6 +++--- src/modules/rijndael/BlowFish.cpp | 4 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/modules') diff --git a/src/modules/aliaseditor/AliasEditorWindow.h b/src/modules/aliaseditor/AliasEditorWindow.h index c9102b559..cd993f83f 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.h +++ b/src/modules/aliaseditor/AliasEditorWindow.h @@ -62,17 +62,17 @@ protected: int m_cPos; public: - inline const QString & name() { return m_szName; }; + const QString & name() const { return m_szName; } void setName(const QString & szName); - inline Type type() { return m_eType; }; + Type type() const { return m_eType; } void setType(Type t); - inline bool isAlias() { return m_eType == Alias; }; - inline bool isNamespace() { return m_eType == Namespace; }; + bool isAlias() const { return m_eType == Alias; } + bool isNamespace() const { return m_eType == Namespace; } void setParentItem(AliasEditorTreeWidgetItem * it) { m_pParentItem = it; }; AliasEditorTreeWidgetItem * parentItem() { return m_pParentItem; }; - inline void setBuffer(const QString & szBuffer) { m_szBuffer = szBuffer; }; - inline const QString & buffer() { return m_szBuffer; }; - inline const int & cursorPosition() { return m_cPos; }; + void setBuffer(const QString & szBuffer) { m_szBuffer = szBuffer; } + const QString & buffer() const { return m_szBuffer; } + const int & cursorPosition() const { return m_cPos; } void setCursorPosition(const int & cPos) { m_cPos = cPos; }; }; diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h index eca3ed97f..492744a57 100644 --- a/src/modules/dcc/DccVideoWindow.h +++ b/src/modules/dcc/DccVideoWindow.h @@ -102,7 +102,7 @@ protected: void stopRecording(); void startPlaying(); void stopPlaying(); - inline bool isPlaying() { return m_bPlaying; }; + bool isPlaying() const { return m_bPlaying; } virtual void run(); virtual bool handleIncomingData(KviDccThreadIncomingData * data, bool bCritical); }; diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h index 08c8811b0..997c471a4 100644 --- a/src/modules/list/ListWindow.h +++ b/src/modules/list/ListWindow.h @@ -80,7 +80,7 @@ private: public: bool operator<(const QTreeWidgetItem & other) const; - inline ChannelTreeWidgetItemData * itemData() { return m_pData; }; + ChannelTreeWidgetItemData * itemData() const { return m_pData; } }; class ChannelTreeWidget : public KviThemedTreeWidget diff --git a/src/modules/notifier/NotifierMessage.h b/src/modules/notifier/NotifierMessage.h index 02c72078a..60c0d76b4 100644 --- a/src/modules/notifier/NotifierMessage.h +++ b/src/modules/notifier/NotifierMessage.h @@ -75,12 +75,12 @@ public: * \brief Returns the original irc message * \return const QString & */ - inline const QString & text() const { return m_szText; } + const QString & text() const { return m_szText; } /** * \brief Returns the message icon * \return QPixmap * */ - inline QPixmap * pixmap() const { return m_pPixmap; } + QPixmap * pixmap() const { return m_pPixmap; } /** * \brief Updates the aspect of this message * \return void diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index 8158b5063..956383176 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -864,7 +864,7 @@ void NotifierWindow::resize(QPoint, bool) setGeometry(m_wndRect); } -inline void NotifierWindow::setCursor(int iCur) +void NotifierWindow::setCursor(int iCur) { if(m_cursor.shape() != iCur) { diff --git a/src/modules/notifier/NotifierWindow.h b/src/modules/notifier/NotifierWindow.h index de29fb60f..20665b871 100644 --- a/src/modules/notifier/NotifierWindow.h +++ b/src/modules/notifier/NotifierWindow.h @@ -112,13 +112,13 @@ public: void addMessage(KviWindow * pWnd, const QString & szImageId, const QString & szText, unsigned int uMessageTime); void setDisableHideOnMainWindowGotAttention(bool b) { m_bDisableHideOnMainWindowGotAttention = b; }; void showLineEdit(bool bShow); - inline int countTabs() const + int countTabs() const { if(m_pWndTabs) return m_pWndTabs->count(); return 0; - }; - inline State state() const { return m_eState; }; + } + State state() const { return m_eState; } protected: void showEvent(QShowEvent * e) override; void hideEvent(QHideEvent * e) override; diff --git a/src/modules/notifier/NotifierWindowBorder.h b/src/modules/notifier/NotifierWindowBorder.h index 37e86e81b..1c6a6ff90 100644 --- a/src/modules/notifier/NotifierWindowBorder.h +++ b/src/modules/notifier/NotifierWindowBorder.h @@ -132,17 +132,17 @@ public: void resetIcons(); // writing methods... - inline int x() const { return m_pnt.x(); } - inline int y() const { return m_pnt.y(); } - inline int width() const { return m_rct.width(); } - inline int height() const { return m_rct.height(); } - inline int baseLine() const { return (y() + height()); } - - inline QRect bodyRect() const { return m_bodyRect; } - inline QRect captionRect() const { return m_captionRect; } - inline QRect rect() const { return m_rct; } - inline QRect closeRect() const { return m_closeIconRect; } - inline QRect titleRect() const { return m_titleRect; } + int x() const { return m_pnt.x(); } + int y() const { return m_pnt.y(); } + int width() const { return m_rct.width(); } + int height() const { return m_rct.height(); } + int baseLine() const { return (y() + height()); } + + QRect bodyRect() const { return m_bodyRect; } + QRect captionRect() const { return m_captionRect; } + QRect rect() const { return m_rct; } + QRect closeRect() const { return m_closeIconRect; } + QRect titleRect() const { return m_titleRect; } void draw(QPainter *, bool b = false); void setPics(bool b = false); diff --git a/src/modules/notifier/NotifierWindowTab.h b/src/modules/notifier/NotifierWindowTab.h index dfc9714cf..550d3dd60 100644 --- a/src/modules/notifier/NotifierWindowTab.h +++ b/src/modules/notifier/NotifierWindowTab.h @@ -88,13 +88,13 @@ public: * \brief Returns the name of the current window * \return QString */ - inline QString label() const { return m_szLabel; } + QString label() const { return m_szLabel; } /** * \brief Returns the pointer of the current window * \return KviWindow * */ - inline KviWindow * wnd() const { return m_pWnd; } + KviWindow * wnd() const { return m_pWnd; } protected: void mouseDoubleClickEvent(QMouseEvent * e) override; void resizeEvent(QResizeEvent * e) override; diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp index 1cf6e0db7..83bc9ca5c 100644 --- a/src/modules/objects/KvsObject_list.cpp +++ b/src/modules/objects/KvsObject_list.cpp @@ -316,7 +316,7 @@ KVSO_CLASS_FUNCTION(list, clear) return true; } -inline int kvi_compare(const KviKvsVariant * p1, const KviKvsVariant * p2) +int kvi_compare(const KviKvsVariant * p1, const KviKvsVariant * p2) { return p1->compare(p2); } diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h index 188a09389..fb65be65d 100644 --- a/src/modules/options/OptionsWidget_message.h +++ b/src/modules/options/OptionsWidget_message.h @@ -130,8 +130,8 @@ private: KviMessageTypeSettings * m_pMsgType; public: - inline int optionId() { return m_iOptId; }; - inline KviMessageTypeSettings * msgType() { return m_pMsgType; }; + int optionId() const { return m_iOptId; } + KviMessageTypeSettings * msgType() const { return m_pMsgType; } }; class MessageColorListWidgetItem : public KviTalListWidgetText @@ -144,7 +144,7 @@ public: int m_iClrIdx; public: - inline int clrIdx() { return m_iClrIdx; }; + int clrIdx() const { return m_iClrIdx; } }; class MessageColorListWidgetItemDelegate : public QItemDelegate diff --git a/src/modules/rijndael/BlowFish.cpp b/src/modules/rijndael/BlowFish.cpp index e56178276..1d16a1d43 100644 --- a/src/modules/rijndael/BlowFish.cpp +++ b/src/modules/rijndael/BlowFish.cpp @@ -436,7 +436,7 @@ void BlowFish::Decrypt(SBlock & block) } //Semi-Portable Byte Shuffling -inline void BytesToBlock(unsigned char const * p, SBlock & b) +void BytesToBlock(unsigned char const * p, SBlock & b) { unsigned int y; //Left @@ -467,7 +467,7 @@ inline void BytesToBlock(unsigned char const * p, SBlock & b) b.m_uir |= y; } -inline void BlockToBytes(SBlock const & b, unsigned char * p) +void BlockToBytes(SBlock const & b, unsigned char * p) { unsigned int y; //Right -- cgit v1.3.1-10-gc9f91