Konversation is an IRC client which gives you speedy access to Freenode network's channels,
where you will find support for most distributions. Its defaults are such that it needs no
configuration other than telling it the name of your distribution channel, to get started.
+ «محادثك» هو عميل آيآرسي يعطيك وصول سريع إلى قنوات شبكة «فرينود»، حيث ستجد الدّعم لمختلف التّوزيعات. الافتراضيّات فيه مضبوطة بحيث لا تحتاج لأن تفعل شيئا عدا كتابة اسم قناة التّوزيعة، ومن ثمّ تبدأ الدّردشة.
El Konversation és un client d'IRC que dóna accés ràpid als canals de la xarxa Freenode, a on trobareu ajuda per a la majoria de les distribucions. De manera predeterminada, no necessita més configuració que indicar el nom del canal de la distribució per començar.
El Konversation és un client d'IRC que dóna accés ràpid als canals de la xarxa Freenode, a on trobareu ajuda per a la majoria de les distribucions. De manera predeterminada, no necessita més configuració que indicar el nom del canal de la distribució per començar.
Konversation ist ein IRC-Programm, mit dem Sie schnell auf Freenode-Kanäle zugreifen können, in denen Sie Unterstützung für die meisten Distributionen erhalten. Die Voreinstellungen sind so gewählt, dass Sie nur den Kanalnamen Ihrer Distribution eingeben müssen.
@@ -73,6 +83,7 @@
Konversation on IRC klient, mis lubab sul edukalt tegutseda Freenode'i võrgu kanalitel. Rakenduse vaikimisi seadistused on niisugused, et sul pole alustamiseks üldjuhul vaja midagi rohkemat, kui ainult teada kanalit, millega ühineda.
Konversation on IRC-asiakas, jolla pääset nopeasti Freenoden verkkokanaville, mistä löydät useimpien jakelujen tuen. Sen oletusasetukset ovat sellaiset, ettei sinun tarvitse kuin vain kertoa jakelusi kanava päästäksesi alkuun.
Konversation est un client IRC qui vous donne un accès rapide aux canaux du réseau Freenode où vous trouverez du support pour la plupart des distributions. Ses configurations par défaut sont telles que vous devez uniquement spécifier le nom de votre distribution pour débuter.
+ Konversation é un cliente de IRC que lle da acceso rápido ás canles da rede Freenode, onde atopará asistencia técnica para a meirande parte das distribucións. A configuración predeterminada está deseñada para que só teña que indicar o nome da canle da distribución para comezar.
שיחה KDE זה לקוח IRC שנותן גישה מהירה לערוצי רשתות Freenode, ותומך ברוב ההפצות. כברירת מחדל לא צריך להגדיר חוץ לבחור שם של אחד מערוצי ההפצות בשביל להתחיל.
Konversation è un client IRC che fornisce un acceso rapido ai canali della rete Freenode, dove troverai supporto per la maggior parte delle distribuzioni. I suoi valori predefiniti fanno sì che non ci sia bisogno di configurazione ulteriore a parte il nome del canale della distribuzione per poter iniziare.
Konversation is een IRC-client die u snel toegang geeft tot networkkanalen van Freenode, waar u ondersteuning voor de meeste distributies zult vinden. Zijn standaarden zijn zo dat het geen instellingen nodig heeft anders dan het de naam van uw distributiekanaal te vertellen om van start te gaan.
@@ -85,10 +96,12 @@
Конверзација је ИРЦ клијент који вам омогућава брз приступ каналима Фринодове мреже, где можете наћи подршку за већину дистрибуција. Подразумеване поставке су такве да не треба ништа да подешавате, већ само да унесете име канала дистрибуције, да бисте почели.
Konverzacija je IRC klijent koji vam omogućava brz pristup kanalima Freenodeove mreže, gde možete naći podršku za većinu distribucija. Podrazumevane postavke su takve da ne treba ništa da podešavate, već samo da unesete ime kanala distribucije, da biste počeli.
Konversation är en IRC-klient som ger snabb åtkomst till Freenode-nätverkets kanaler, där det finns stöd för de flesta distributioner. Standardinställningarna är sådana att ingen inställning behövs för att komma igång annat än att tala om namnet på distributionens kanal för den.
+ Konversation, çoğu dağıtım için destek bulacağınız Freenode ağ kanallarına hızlı erişim sağlayan bir IRC istemcisidir. Varsayılanları, başlamak için dağıtım kanalınızın adını söylemekten başka bir yapılandırmaya ihtiyaç duymayacak şekildedir.
Konversation — клієнтська програма IRC, за допомогою якої ви зможете швидко отримати доступ до каналів мережі Freenode, на яких можна спілкуватися із іншими користувачами та розробниками. Якщо ви скористаєтеся типовими параметрами роботи програми, вам достатньо буде вказати лише назву потрібного вам каналу, щоб розпочати спілкування на ньому.
xxKonversation is an IRC client which gives you speedy access to Freenode network's channels, where you will find support for most distributions. Its defaults are such that it needs no configuration other than telling it the name of your distribution channel, to get started.xx
- Konversation 是一個讓您可以快速連上 Freenode 網路頻道的 IRC 客戶端，在那裡您可以找到大多數散佈版的支援。
+ Konversation 是一個讓您可以快速連上 Freenode 網路頻道的 IRC 客戶端，在那裡您可以找到大多數散佈版的支援。其預設不需要任何設定，您只需要告訴它您散佈版頻道的名字就可以開始了。
Features:
+ الميزات:
Característiques:
Característiques:
Vlastnosti:
@@ -100,6 +113,7 @@
Omadused:
Ominaisuuksia:
Fonctionnalités :
+ Funcionalidades:
תכונות:
Funzionalità:
Mogelijkheden:
@@ -113,12 +127,14 @@
Могућности:
Mogućnosti:
Funktioner:
+ Özellikler:
Можливості:
xxFeatures:xx
功能：
功能：
- Standard IRC features
+ - ميزات آيآرسي القياسيّة
- Funcionalitats estàndard de l'IRC
- Funcionalitats estàndard de l'IRC
- Standard-IRC-Funktionen
@@ -128,6 +144,7 @@
- Tavapärased IRC omadused
- IRCin vakio-ominaisuudet
- Fonctionnalités standards IRC
+ - Funcionalidades estándar de IRC.
- תכונות IRC רגילות
- Funzionalità di base di IRC
- Standaard IRC-functies
@@ -140,10 +157,12 @@
- стандардне ИРЦ могућности
- standardne IRC mogućnosti
- Vanliga IRC-funktioner
+ - Standart IRC özellikleri
- Стандартні можливості IRC
- xxStandard IRC featuresxx
- - 獨立的 IRC 功能
+ - 標準 IRC 功能
- SSL server support
+ - دعم خواديم SSL
- Permet un servidor SSL
- Permet un servidor SSL
- Unterstützung für SSL-Server
@@ -153,6 +172,7 @@
- SSL-serveri toetus
- SSL-palvelintuki
- Prise en charge de serveurs SSL
+ - Compatibilidade con servidores SSL.
- תמיכה בשרתים מאובטחים ב־SSL
- Supporto per i server SSL
- Ondersteuning voor SSL-server
@@ -165,10 +185,12 @@
- подршка за ССЛ сервере
- podrška za SSL servere
- Stöd för SSL-server
+ - SSL sunucu desteği
- Підтримка роботи із серверами SSL
- xxSSL server supportxx
- 支援 SSL 伺服器
- Bookmarking support
+ - دعم العلامات
- Permet les adreces d'interès
- Permet les adreces d'interés
- Unterstützung für Lesezeichen
@@ -178,6 +200,7 @@
- Järjehoidjate toetus
- Kirjanmerkkituki
- Prise en charge des signets
+ - Marcadores.
- תמיכה בסימניות
- Supporto per i segnalibri
- Ondersteuning voor bladwijzers
@@ -190,10 +213,12 @@
- подршка за обележиваче
- podrška za obeleživače
- Stöd för bokmärken
+ - Yer imi desteği
- Підтримка роботи із закладками
- xxBookmarking supportxx
- 支援書籤
- Easy to use graphical user interface
+ - واجهة مستخدم سهلة الاستخدام
- Interfície gràfica d'usuari fàcil d'utilitzar
- Interfície gràfica d'usuari fàcil d'utilitzar
- Einfach zu bedienende grafische Benutzeroberfläche
@@ -203,6 +228,7 @@
- Hõlpsasti mõistetav graafiline kasutajaliides
- Helppokäyttöinen graafinen käyttöliittymä
- Interface graphique simple d'utilisation
+ - Interface de usuario fácil de usar.
- ממשק משתמש גרפי קל לשימוש
- Interfaccia grafica semplice da usare
- Gemakkelijk te gebruiken grafische gebruikersinterface
@@ -215,10 +241,12 @@
- предусретљиво графичко корисничко сучеље
- predusretljivo grafičko korisničko sučelje
- Lättanvänt grafiskt användargränssnitt
+ - Kullanımı kolay grafik kullanıcı arayüzü
- Простий у користуванні графічний інтерфейс
- xxEasy to use graphical user interfacexx
- 易於使用的圖形化使用者介面
- Multiple servers and channels in one single window
+ - عدّة خواديم وقنوات في نافذة واحدة
- Diversos servidors i canals en una única finestra
- Diversos servidors i canals en una única finestra
- Mehrere Server und Kanäle in einem einzelnen Fenster
@@ -228,6 +256,7 @@
- Eri serverite ja kanalite koondamine ühte aknasse
- Useampi palvelin ja kanava yhdessä ikkunassa
- Multiples serveurs et canaux dans une unique fenêtre
+ - Varios servidores e canles nunha mesma xanela.
- מספר שרתים וערוצים בחלון אחד
- Diversi server e canali in un'unica finestra
- Meerdere servers and kanalen in een enkel venster
@@ -240,10 +269,12 @@
- више сервера и канала у једном прозору
- više servera i kanala u jednom prozoru
- Flera servrar och kanaler i ett enda fönster
+ - Tek bir pencerede birden çok sunucu ve kanal
- Показ даних декількох серверів та каналів у одному вікні
- xxMultiple servers and channels in one single windowxx
- - 單一個視窗內可使用多個伺服器與頻道
+ - 在單一視窗中查看多個伺服器與頻道
- DCC file transfer
+ - نقل الملفّات عبر DCC
- Transferència de fitxers DCC
- Transferència de fitxers DCC
- DCC-Dateiübertragung
@@ -253,6 +284,7 @@
- DCC-failiedastus
- DCC-tiedostonsiirto
- Transfert de fichier DCC
+ - Transferencia de ficheiros por DCC.
- העברת קבצים באמצעות DCC
- Trasferimento file tramite DCC
- DCC Bestandsoverdracht
@@ -265,10 +297,12 @@
- ДЦЦ пренос фајлова
- DCC prenos fajlova
- DCC-filöverföring
+ - DCC dosya aktarımı
- Передавання файлів за допомогою DCC
- xxDCC file transferxx
- DCC 檔案傳輸
- Multiple identities for different servers
+ - عدّة هويّات لمختلف الخواديم
- Diverses identitats per servidors diferents
- Diverses identitats per servidors diferents
- Unterschiedliche Identitäten für verschiedene Server
@@ -278,6 +312,7 @@
- Eri serverites eri identiteedi kasutamise võimalus
- Useampi henkilöys eri palvelimiin
- Multiples identités pour différents serveurs
+ - Varias identidades para distintos servidores.
- זהויות שונות לשרתים שונים
- Identità multiple per i vari server
- Meerdere identiteiten voor verschillende servers
@@ -290,10 +325,12 @@
- вишеструки идентитети за различите сервере
- višestruki identiteti za različite servere
- Fler identiteter för olika servrar
+ - Farklı sunucular için birden fazla kimlik
- Можливість користування декількома профілями на різних серверах
- xxMultiple identities for different serversxx
- - 同一個伺服器可以有多個不同的身份識別
+ - 在不同伺服器可使用不同的憑證登入
- Text decorations and colors
+ - زخرفة النّصوص وتلوينها
- Decoracions del text i colors
- Decoracions del text i colors
- Textdekoration und -farben
@@ -303,6 +340,7 @@
- Teksti dekoratsioonid ja värvid
- Tekstitehosteet ja -värit
- Décorations du texte et couleurs
+ - Decoracións e cores de texto.
- עיצוב וצבעי טקסט
- Decorazioni e colori per il testo
- Tekstdecoraties en kleuren
@@ -315,10 +353,12 @@
- декорације и бојење текста
- dekoracije i bojenje teksta
- Textdekorationer och färger
+ - Metin süslemeleri ve renkleri
- Можливість декорування та розфарбовування тексту
- xxText decorations and colorsxx
- 文字裝飾與色彩
- OnScreen Display for notifications
+ - عرض الإخطارات على الشّاشة
- Mostra les notificacions en la pantalla
- Mostra les notificacions en la pantalla
- OnScreen-Anzeige fir Benachrichtigungen
@@ -328,6 +368,7 @@
- Märguannete kuvamine ekraanil
- Ilmoitusten ruutunäyttö
- Affichage à l'écran des notifications
+ - Notificacións visualizadas na pantalla.
- התראות על המסך
- Notifiche a schermo (OnScreen Display)
- Meldingen op het scherm tonen
@@ -340,10 +381,12 @@
- екрански приказ за обавештења
- ekranski prikaz za obaveštenja
- Visning av underrättelser på skärmen
+ - Bildirimler için Ekran Gösterimleri
- Екранна панель для показу сповіщень
- xxOnScreen Display for notificationsxx
- 通知的 OSD 支援
- Automatic UTF-8 detection
+ - اكتشاف آليّ لUTF-8
- Detecció automàtica d'UTF-8
- Detecció automàtica d'UTF-8
- Automatische UTF-8-Erkennung
@@ -353,6 +396,7 @@
- Automaatne UTF-8 tuvastamine
- Automaattinen UTF-8-tunnistus
- Détection automatique de l'UTF-8
+ - Detección automática de UTF-8.
- זיהוי UTF-8 אוטומטי
- Rilevamento automatico di UTF-8
- Automatische detectie van UTF-8
@@ -365,10 +409,12 @@
- аутоматско откривање УТФ‑8
- automatsko otkrivanje UTF‑8
- Automatisk detektering av UTF-8
+ - Otomatik UTF-8 algılama
- Автоматичне виявлення UTF-8
- xxAutomatic UTF-8 detectionxx
- 自動 UTF-8 偵測
- Per channel encoding support
+ - دعم التّرميزات لكلّ قناة على حدة
- Permet codificació per canal
- Permet codificació per canal
- Unterstützung für Kodierung pro Kanal
@@ -378,6 +424,7 @@
- Võimalus määrata kodeeringut igal kanalil eraldi
- Kanavakohtainen merkistökoodaustuki
- Prise en charge de l'encodage par canal
+ - Admite codificacións distintas en cada canle.
- קידוד ספציפי לכל ערוץ
- Supporto di codifiche per canale
- Ondersteuning voor codering per kanaal
@@ -390,10 +437,12 @@
- подршка за кодирање по каналу
- podrška za kodiranje po kanalu
- Kodningsstöd per kanal
+ - Kanal başına şifreleme desteği
- Можливість встановлення окремого кодування символів для кожного з каналів
- xxPer channel encoding supportxx
- 每個頻道各自使用不同的編碼的支援
- Theme support for nick icons
+ - دعم السّمات لأيقونات المستخدمين
- Permet temes per icones de sobrenom
- Permet temes per icones de sobrenom
- Unterstützung für Spitznamen-Symbol-Designs
@@ -403,6 +452,7 @@
- Kasutajate ikoonidel teemavälimuse kasutamise võimalus
- Teematuki tunnuskuvakkeille
- Prise en charge de thèmes pour les images de pseudonyme
+ - Temas para iconas de alcumes.
- תמיכה בערכות נושא לסמל הכינוי
- Supporto di temi per le icone dei nick
- Ondersteuning van thema voor pictogrammen bij schermnamen.
@@ -415,10 +465,12 @@
- тематска подршка за иконице надимака
- tematska podrška za ikonice nadimaka
- Temastöd för smeknamnsikoner
+ - Takma ad simgeleri için tema desteği
- Підтримка тем для піктограм профілів
- xxTheme support for nick iconsxx
- 暱稱圖示的主題支援
- Highly configurable
+ - عال التّخصيص والضّبط
- Altament configurable
- Altament configurable
- Sehr anpassbar
@@ -428,6 +480,7 @@
- Igati seadistatav
- Laajalti mukautettavissa
- Hautement configurable
+ - Altamente configurábel.
- הרבה אפשרויות הגדרה
- Altamente configurabile
- Hoog instelbaar
@@ -440,6 +493,7 @@
- висока подесивост
- visoka podesivost
- Mycket anpassningsbar
+ - Son derece yapılandırılabilir
- Широкі можливості із налаштовування
- xxHighly configurablexx
- 高度可自訂性
diff --git a/data/org.kde.konversation.desktop b/data/org.kde.konversation.desktop
--- a/data/org.kde.konversation.desktop
+++ b/data/org.kde.konversation.desktop
@@ -5,8 +5,7 @@
X-DocPath=konversation/index.html
MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
GenericName=IRC Client
-GenericName[ar]=عميل IRC
-GenericName[ast]=Veceru IRC
+GenericName[ar]=عميل آيآرسي
GenericName[be]=Кліент IRC
GenericName[bg]=IRC клиент
GenericName[bs]=IRC klijent
@@ -27,7 +26,6 @@
GenericName[he]=לקוח IRC
GenericName[hne]=आईआरसी क्लायंट
GenericName[hu]=IRC-kliens
-GenericName[is]=IRC-forrit
GenericName[it]=Client IRC
GenericName[kk]=IRC клиенті
GenericName[km]=ម៉ាស៊ីនភ្ញៀវ IRC
@@ -62,7 +60,6 @@
Terminal=false
Name=Konversation
Name[ar]=محادثك
-Name[ast]=Konversation
Name[be]=Konversation
Name[bg]=Konversation
Name[bs]=Konverzacija
@@ -86,7 +83,6 @@
Name[hne]=कनवर्सेसन
Name[hr]=Konversation
Name[hu]=Konversation
-Name[is]=Konversation
Name[it]=Konversation
Name[kk]=Konversation
Name[km]=Konversation
diff --git a/src/application.h b/src/application.h
--- a/src/application.h
+++ b/src/application.h
@@ -174,7 +174,7 @@
void closeWallet();
protected:
- bool event(QEvent* event);
+ bool event(QEvent* event) Q_DECL_OVERRIDE;
private:
void implementRestart();
diff --git a/src/bookmarkhandler.h b/src/bookmarkhandler.h
--- a/src/bookmarkhandler.h
+++ b/src/bookmarkhandler.h
@@ -37,13 +37,13 @@
~KonviBookmarkHandler();
// KBookmarkOwner interface:
- virtual void openBookmark(const KBookmark &bm, Qt::MouseButtons mb, Qt::KeyboardModifiers km);
- virtual QUrl currentUrl() const;
- virtual QString currentTitle() const;
- virtual bool enableOption(BookmarkOption option) const;
- virtual bool supportsTabs() const;
- virtual QList currentBookmarkList() const;
- virtual void openFolderinTabs(const KBookmarkGroup &group);
+ void openBookmark(const KBookmark &bm, Qt::MouseButtons mb, Qt::KeyboardModifiers km) Q_DECL_OVERRIDE;
+ QUrl currentUrl() const Q_DECL_OVERRIDE;
+ QString currentTitle() const Q_DECL_OVERRIDE;
+ bool enableOption(BookmarkOption option) const Q_DECL_OVERRIDE;
+ bool supportsTabs() const Q_DECL_OVERRIDE;
+ QList currentBookmarkList() const Q_DECL_OVERRIDE;
+ void openFolderinTabs(const KBookmarkGroup &group) Q_DECL_OVERRIDE;
private:
MainWindow* m_mainWindow;
diff --git a/src/commit.h b/src/commit.h
--- a/src/commit.h
+++ b/src/commit.h
@@ -1,4 +1,4 @@
// This COMMIT number is added to version string to be used as "patch level"
#ifndef COMMIT
-#define COMMIT 5020
+#define COMMIT 5108
#endif
diff --git a/src/config/alias_config.h b/src/config/alias_config.h
--- a/src/config/alias_config.h
+++ b/src/config/alias_config.h
@@ -25,10 +25,10 @@
explicit Alias_Config(QWidget* parent, const char* name = 0);
~Alias_Config();
- virtual void saveSettings();
- virtual void loadSettings();
- virtual void restorePageToDefaults();
- virtual bool hasChanged();
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
+ bool hasChanged() Q_DECL_OVERRIDE;
Q_SIGNALS:
void modified();
diff --git a/src/config/autoreplace_config.h b/src/config/autoreplace_config.h
--- a/src/config/autoreplace_config.h
+++ b/src/config/autoreplace_config.h
@@ -25,11 +25,11 @@
explicit Autoreplace_Config(QWidget* parent, const char* name=NULL);
~Autoreplace_Config();
- virtual void saveSettings();
- virtual void loadSettings();
- virtual void restorePageToDefaults();
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
- virtual bool hasChanged();
+ bool hasChanged() Q_DECL_OVERRIDE;
Q_SIGNALS:
void modified();
diff --git a/src/config/configdialog.h b/src/config/configdialog.h
--- a/src/config/configdialog.h
+++ b/src/config/configdialog.h
@@ -275,12 +275,12 @@
/**
* @internal
*/
- virtual void showEvent(QShowEvent *e);
+ void showEvent(QShowEvent *e) Q_DECL_OVERRIDE;
/**
* @internal
*/
- virtual void moveEvent(QMoveEvent *e);
+ void moveEvent(QMoveEvent *e) Q_DECL_OVERRIDE;
private Q_SLOTS:
/**
diff --git a/src/config/connectionbehavior_config.h b/src/config/connectionbehavior_config.h
--- a/src/config/connectionbehavior_config.h
+++ b/src/config/connectionbehavior_config.h
@@ -32,11 +32,11 @@
public:
explicit ConnectionBehavior_Config(QWidget* parent = NULL);
- virtual void restorePageToDefaults();
- virtual void saveSettings();
- virtual void loadSettings();
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
- virtual bool hasChanged();
+ bool hasChanged() Q_DECL_OVERRIDE;
protected Q_SLOTS:
void setPasswordChanged(bool changed = true);
diff --git a/src/config/dcc_config.h b/src/config/dcc_config.h
--- a/src/config/dcc_config.h
+++ b/src/config/dcc_config.h
@@ -30,7 +30,7 @@
void dccUPnPChanged(int state);
protected:
- virtual void showEvent(QShowEvent *event);
+ void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
};
#endif
diff --git a/src/config/highlight_config.h b/src/config/highlight_config.h
--- a/src/config/highlight_config.h
+++ b/src/config/highlight_config.h
@@ -28,11 +28,11 @@
~Highlight_Config();
public:
- virtual void saveSettings();
- virtual void loadSettings();
- virtual void restorePageToDefaults();
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
- virtual bool hasChanged();
+ bool hasChanged() Q_DECL_OVERRIDE;
Q_SIGNALS:
void modified();
diff --git a/src/config/highlighttreewidget.h b/src/config/highlighttreewidget.h
--- a/src/config/highlighttreewidget.h
+++ b/src/config/highlighttreewidget.h
@@ -22,7 +22,7 @@
HighlightTreeWidget(QWidget *parent = nullptr);
protected:
- virtual void dropEvent(QDropEvent *event);
+ void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
signals:
void itemDropped();
diff --git a/src/config/ignore_config.h b/src/config/ignore_config.h
--- a/src/config/ignore_config.h
+++ b/src/config/ignore_config.h
@@ -26,11 +26,11 @@
~Ignore_Config();
QString flagNames;
- virtual void restorePageToDefaults();
- virtual void saveSettings();
- virtual void loadSettings();
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
- virtual bool hasChanged();
+ bool hasChanged() Q_DECL_OVERRIDE;
private:
QStringList m_oldIgnoreList;
diff --git a/src/config/nicklistbehavior_config.h b/src/config/nicklistbehavior_config.h
--- a/src/config/nicklistbehavior_config.h
+++ b/src/config/nicklistbehavior_config.h
@@ -25,11 +25,11 @@
explicit NicklistBehavior_Config(QWidget *parent = 0, const char *name = 0);
~NicklistBehavior_Config();
- virtual void saveSettings();
- virtual void loadSettings();
- virtual void restorePageToDefaults();
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
- virtual bool hasChanged();
+ bool hasChanged() Q_DECL_OVERRIDE;
private:
void setNickList(const QString &sortingOrder);
diff --git a/src/config/osd_config.h b/src/config/osd_config.h
--- a/src/config/osd_config.h
+++ b/src/config/osd_config.h
@@ -30,11 +30,11 @@
explicit OSD_Config( QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0 );
~OSD_Config();
- virtual void restorePageToDefaults();
- virtual void saveSettings();
- virtual void loadSettings();
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
- virtual bool hasChanged(); // implement the interface, will not be used here, though
+ bool hasChanged(); // implement the interface, will not be used here, though
protected Q_SLOTS:
void slotOSDEnabledChanged(bool on);
@@ -47,8 +47,8 @@
void slotPositionChanged();
protected:
- void showEvent(QShowEvent* event);
- void hideEvent(QHideEvent* event);
+ void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+ void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
private:
OSDPreviewWidget* m_pOSDPreview;
diff --git a/src/config/quickbuttons_config.h b/src/config/quickbuttons_config.h
--- a/src/config/quickbuttons_config.h
+++ b/src/config/quickbuttons_config.h
@@ -25,11 +25,11 @@
explicit QuickButtons_Config(QWidget* parent, const char* name=NULL);
~QuickButtons_Config();
- virtual void saveSettings();
- virtual void loadSettings();
- virtual void restorePageToDefaults();
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
- virtual bool hasChanged();
+ bool hasChanged() Q_DECL_OVERRIDE;
Q_SIGNALS:
void modified();
diff --git a/src/config/settingsdialog.h b/src/config/settingsdialog.h
--- a/src/config/settingsdialog.h
+++ b/src/config/settingsdialog.h
@@ -41,14 +41,14 @@
~KonviSettingsDialog();
protected Q_SLOTS:
- virtual void updateSettings();
- virtual void updateWidgets();
- virtual void updateWidgetsDefault();
+ void updateSettings() Q_DECL_OVERRIDE;
+ void updateWidgets() Q_DECL_OVERRIDE;
+ void updateWidgetsDefault() Q_DECL_OVERRIDE;
void modifiedSlot();
protected:
- virtual bool hasChanged();
- virtual bool isDefault();
+ bool hasChanged() Q_DECL_OVERRIDE;
+ bool isDefault() Q_DECL_OVERRIDE;
Warnings_Config* m_confWarningsWdg;
Theme_Config* m_confThemeWdg;
diff --git a/src/config/tabs_config.h b/src/config/tabs_config.h
--- a/src/config/tabs_config.h
+++ b/src/config/tabs_config.h
@@ -27,7 +27,7 @@
void toggleCheckBoxes(int activated);
protected:
- virtual void showEvent(QShowEvent *event);
+ void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
};
#endif
diff --git a/src/config/theme_config.h b/src/config/theme_config.h
--- a/src/config/theme_config.h
+++ b/src/config/theme_config.h
@@ -29,11 +29,11 @@
explicit Theme_Config(QWidget* parent, const char* name=NULL);
~Theme_Config();
- virtual void restorePageToDefaults();
- virtual void saveSettings();
- virtual void loadSettings();
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
- virtual bool hasChanged();
+ bool hasChanged() Q_DECL_OVERRIDE;
Q_SIGNALS:
void modified();
diff --git a/src/config/warnings_config.h b/src/config/warnings_config.h
--- a/src/config/warnings_config.h
+++ b/src/config/warnings_config.h
@@ -25,11 +25,11 @@
explicit Warnings_Config( QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0 );
~Warnings_Config();
- virtual void restorePageToDefaults();
- virtual void saveSettings();
- virtual void loadSettings();
+ void restorePageToDefaults() Q_DECL_OVERRIDE;
+ void saveSettings() Q_DECL_OVERRIDE;
+ void loadSettings() Q_DECL_OVERRIDE;
- virtual bool hasChanged();
+ bool hasChanged() Q_DECL_OVERRIDE;
public Q_SLOTS:
virtual void languageChange();
diff --git a/src/dcc/chatcontainer.h b/src/dcc/chatcontainer.h
--- a/src/dcc/chatcontainer.h
+++ b/src/dcc/chatcontainer.h
@@ -34,20 +34,20 @@
~ChatContainer();
// ChatWindow
- virtual bool closeYourself(bool askForConfirmation=true);
- virtual bool canBeFrontView();
- virtual bool searchView();
+ bool closeYourself(bool askForConfirmation=true) Q_DECL_OVERRIDE;
+ bool canBeFrontView() Q_DECL_OVERRIDE;
+ bool searchView() Q_DECL_OVERRIDE;
- virtual void setChannelEncoding(const QString &encoding);
- virtual QString getChannelEncoding();
- virtual QString getChannelEncodingDefaultDesc();
- virtual void emitUpdateInfo();
+ void setChannelEncoding(const QString &encoding) Q_DECL_OVERRIDE;
+ QString getChannelEncoding() Q_DECL_OVERRIDE;
+ QString getChannelEncodingDefaultDesc() Q_DECL_OVERRIDE;
+ void emitUpdateInfo() Q_DECL_OVERRIDE;
QString ownNick() const;
protected:
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
public Q_SLOTS:
void setPartnerNick(const QString &nick);
diff --git a/src/dcc/dccfiledialog.h b/src/dcc/dccfiledialog.h
--- a/src/dcc/dccfiledialog.h
+++ b/src/dcc/dccfiledialog.h
@@ -28,7 +28,7 @@
bool passiveSend();
- QSize sizeHint() const;
+ QSize sizeHint() const Q_DECL_OVERRIDE;
private:
KFileWidget* m_fileWidget;
diff --git a/src/dcc/transferlistmodel.h b/src/dcc/transferlistmodel.h
--- a/src/dcc/transferlistmodel.h
+++ b/src/dcc/transferlistmodel.h
@@ -81,9 +81,9 @@
public:
explicit TransferSizeDelegate(KCategoryDrawer* categoryDrawer, QObject *parent = 0);
- virtual QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
- virtual void paint(QPainter *painter, const QStyleOptionViewItem & option,
- const QModelIndex &index) const;
+ QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const Q_DECL_OVERRIDE;
+ void paint(QPainter *painter, const QStyleOptionViewItem & option,
+ const QModelIndex &index) const Q_DECL_OVERRIDE;
private:
KCategoryDrawer* m_categoryDrawer;
};
@@ -93,17 +93,17 @@
public:
explicit TransferProgressBarDelegate(QObject *parent = 0);
- virtual void paint(QPainter *painter, const QStyleOptionViewItem & option,
- const QModelIndex &index) const;
+ void paint(QPainter *painter, const QStyleOptionViewItem & option,
+ const QModelIndex &index) const Q_DECL_OVERRIDE;
};
class TransferListProxyModel : public QSortFilterProxyModel
{
public:
explicit TransferListProxyModel(QObject *parent = 0);
- bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
+ bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
};
@@ -128,21 +128,21 @@
void appendHeader(TransferHeaderData data);
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
// counts the rows regardless of what type they are
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
// itemCount only counts the transferitems, not the CategoryItems
int itemCount(TransferItemData::ItemDisplayType displaytype) const;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant headerData (int section, Qt::Orientation orientation,
- int role = Qt::DisplayRole) const;
+ int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
bool removeRow (int row, const QModelIndex &parent = QModelIndex());
- virtual bool removeRows (int row, int count,
- const QModelIndex &parent = QModelIndex());
+ bool removeRows (int row, int count,
+ const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
- Qt::ItemFlags flags (const QModelIndex &index) const;
+ Qt::ItemFlags flags (const QModelIndex &index) const Q_DECL_OVERRIDE;
static QString getStatusText(Transfer::Status status, Transfer::Type type);
static QString getSpeedPrettyText(transferspeed_t speed);
diff --git a/src/dcc/transferpanel.h b/src/dcc/transferpanel.h
--- a/src/dcc/transferpanel.h
+++ b/src/dcc/transferpanel.h
@@ -76,7 +76,7 @@
protected:
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
private:
inline void initGUI();
diff --git a/src/dcc/transferrecv.h b/src/dcc/transferrecv.h
--- a/src/dcc/transferrecv.h
+++ b/src/dcc/transferrecv.h
@@ -64,19 +64,19 @@
void setReverse(bool reverse, const QString &reverseToken);
public Q_SLOTS:
- virtual bool queue();
+ bool queue() Q_DECL_OVERRIDE;
/** The user has accepted the download.
* Check we are saving it somewhere valid, create any directories needed, and
* connect to remote host.
*/
- virtual void start();
+ void start() Q_DECL_OVERRIDE;
/** The user has chosen to abort.
* Either by chosen to abort directly, or by choosing cancel when
* prompted for information on where to save etc.
* Not called when it fails due to another problem.
*/
- virtual void abort();
+ void abort() Q_DECL_OVERRIDE;
void startResume(quint64 position);
protected Q_SLOTS:
@@ -101,7 +101,7 @@
void sendReverseAck(bool error, quint16 port);
protected:
- void cleanUp();
+ void cleanUp() Q_DECL_OVERRIDE;
// (startPosition == 0) means "don't resume"
void prepareLocalKio(bool overwrite, bool resume, KIO::fileoffset_t startPosition = 0);
diff --git a/src/dcc/transfersend.h b/src/dcc/transfersend.h
--- a/src/dcc/transfersend.h
+++ b/src/dcc/transfersend.h
@@ -59,9 +59,9 @@
void reject();
public Q_SLOTS:
- virtual bool queue();
- virtual void start();
- virtual void abort();
+ bool queue() Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
+ void abort() Q_DECL_OVERRIDE;
// invoked when the receiver accepts the offer (Reverse DCC)
void connectToReceiver(const QString &partnerHost, quint16 partnerPort);
@@ -79,7 +79,7 @@
void slotLocalCopyReady(KJob *job);
protected:
- void cleanUp();
+ void cleanUp() Q_DECL_OVERRIDE;
void startConnectionTimer(int secs);
void stopConnectionTimer();
diff --git a/src/dcc/transferview.h b/src/dcc/transferview.h
--- a/src/dcc/transferview.h
+++ b/src/dcc/transferview.h
@@ -47,7 +47,7 @@
int rowCount() const;
QList rowIndexes(int column = 0) const;
- QList selectedIndexes() const;
+ QList selectedIndexes() const Q_DECL_OVERRIDE;
QList selectedRows(int column = 0) const;
QModelIndex index(int row, int column) const;
QModelIndex index(Transfer *transfer) const;
@@ -82,10 +82,10 @@
int newStatus, int oldStatus);
protected:
- virtual void drawRow(QPainter *painter, const QStyleOptionViewItem &option,
- const QModelIndex &index) const;
- virtual void scrollContentsBy(int dx, int dy);
- virtual void keyPressEvent(QKeyEvent *event);
+ void drawRow(QPainter *painter, const QStyleOptionViewItem &option,
+ const QModelIndex &index) const Q_DECL_OVERRIDE;
+ void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
protected Q_SLOTS:
void rowsAboutToBeRemovedFromModel(const QModelIndex &parent,
diff --git a/src/dcc/whiteboardcolorchooser.h b/src/dcc/whiteboardcolorchooser.h
--- a/src/dcc/whiteboardcolorchooser.h
+++ b/src/dcc/whiteboardcolorchooser.h
@@ -55,9 +55,9 @@
void backgroundColorChanged(const QColor& color);
protected:
- virtual void mouseReleaseEvent(QMouseEvent *e);
- virtual void paintEvent(QPaintEvent *e);
- virtual void resizeEvent(QResizeEvent *e);
+ void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+ void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
private:
inline QRect swapPixmapRect() const;
diff --git a/src/dcc/whiteboardfontchooser.h b/src/dcc/whiteboardfontchooser.h
--- a/src/dcc/whiteboardfontchooser.h
+++ b/src/dcc/whiteboardfontchooser.h
@@ -39,7 +39,7 @@
void fontChanged(const QFont& font);
protected:
- virtual void closeEvent(QCloseEvent* event);
+ void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
protected Q_SLOTS:
void currentFontChanged(const QFont& font);
diff --git a/src/dcc/whiteboardpaintarea.h b/src/dcc/whiteboardpaintarea.h
--- a/src/dcc/whiteboardpaintarea.h
+++ b/src/dcc/whiteboardpaintarea.h
@@ -90,12 +90,12 @@
void colorPicked(const QColor& color);
protected:
- virtual void paintEvent(QPaintEvent * event);
- virtual void resizeEvent(QResizeEvent * event);
- virtual void mousePressEvent(QMouseEvent * event);
- virtual void mouseReleaseEvent(QMouseEvent * event);
- virtual void mouseMoveEvent(QMouseEvent * event);
- virtual void keyPressEvent(QKeyEvent * event);
+ void paintEvent(QPaintEvent * event) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE;
+ void mousePressEvent(QMouseEvent * event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(QMouseEvent * event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent * event) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent * event) Q_DECL_OVERRIDE;
private:
inline void makeLastPosInvalid();
diff --git a/src/identitydialog.h b/src/identitydialog.h
--- a/src/identitydialog.h
+++ b/src/identitydialog.h
@@ -36,7 +36,7 @@
IdentityPtr currentIdentity() const;
public Q_SLOTS:
- virtual void accept();
+ void accept() Q_DECL_OVERRIDE;
Q_SIGNALS:
void identitiesChanged();
diff --git a/src/irc/channel.h b/src/irc/channel.h
--- a/src/irc/channel.h
+++ b/src/irc/channel.h
@@ -75,38 +75,38 @@
~Channel();
//META
- virtual bool canBeFrontView();
- virtual bool searchView();
+ bool canBeFrontView() Q_DECL_OVERRIDE;
+ bool searchView() Q_DECL_OVERRIDE;
- virtual void append(const QString& nickname, const QString& message, const QHash &messageTags = QHash(), const QString& label = QString());
- virtual void appendAction(const QString& nickname, const QString& message, const QHash &messageTags = QHash());
+ void append(const QString& nickname, const QString& message, const QHash &messageTags = QHash(), const QString& label = QString()) Q_DECL_OVERRIDE;
+ void appendAction(const QString& nickname, const QString& message, const QHash &messageTags = QHash()) Q_DECL_OVERRIDE;
void nickActive(const QString& nickname);
#ifdef HAVE_QCA2
Konversation::Cipher* getCipher();
#endif
//General administrative stuff
public:
- void setName(const QString& newName);
+ void setName(const QString& newName) Q_DECL_OVERRIDE;
QString getPassword();
const Konversation::ChannelSettings channelSettings();
QString getPassword() const;
- virtual void setServer(Server* newServer);
+ void setServer(Server* newServer) Q_DECL_OVERRIDE;
void setEncryptedOutput(bool);
bool joined() const { return m_joined; }
bool rejoinable();
//Unsure of future placement and/or continued existence of these members
int numberOfNicks() const { return nicks; }
int numberOfOps() const { return ops; }
- virtual void setChannelEncoding(const QString& encoding);
- virtual QString getChannelEncoding();
- virtual QString getChannelEncodingDefaultDesc();
+ void setChannelEncoding(const QString& encoding) Q_DECL_OVERRIDE;
+ QString getChannelEncoding() Q_DECL_OVERRIDE;
+ QString getChannelEncodingDefaultDesc() Q_DECL_OVERRIDE;
- virtual bool log();
+ bool log() Q_DECL_OVERRIDE;
protected:
// use with caution! does not check for duplicates
@@ -126,7 +126,7 @@
void autoWho();
void updateAutoWho();
void fadeActivity();
- virtual void serverOnline(bool online);
+ void serverOnline(bool online) Q_DECL_OVERRIDE;
void delayedSortNickList();
@@ -149,7 +149,7 @@
void adjustNicks(int value);
void adjustOps(int value);
- virtual void emitUpdateInfo();
+ void emitUpdateInfo() Q_DECL_OVERRIDE;
void resizeNicknameListViewColumns();
@@ -209,14 +209,14 @@
//Generic GUI
public:
- virtual bool eventFilter(QObject* watched, QEvent* e);
+ bool eventFilter(QObject* watched, QEvent* e) Q_DECL_OVERRIDE;
//Specific GUI
public:
void updateModeWidgets(char mode, bool plus, const QString ¶meter);
/// Sounds suspiciously like a destructor..
- virtual bool closeYourself(bool askForConfirmation=true);
+ bool closeYourself(bool askForConfirmation=true) Q_DECL_OVERRIDE;
bool autoJoin();
@@ -234,12 +234,12 @@
void updateQuickButtons();
void channelTextEntered();
void channelPassthroughCommand();
- void sendText(const QString& line);
+ void sendText(const QString& line) Q_DECL_OVERRIDE;
void showOptionsDialog();
void showQuickButtons(bool show);
void showModeButtons(bool show);
- virtual void indicateAway(bool show);
+ void indicateAway(bool show) Q_DECL_OVERRIDE;
void showTopic(bool show);
void showNicknameBox(bool show);
void showNicknameList(bool show);
@@ -274,10 +274,10 @@
void nicknameListViewTextChanged(int textChangedFlags);
protected:
- void showEvent(QShowEvent* event);
+ void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
void syncSplitters();
/// Called from ChatWindow adjustFocus
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
// to take care of redraw problem if hidden
bool quickButtonsChanged;
diff --git a/src/irc/channellistpanel.h b/src/irc/channellistpanel.h
--- a/src/irc/channellistpanel.h
+++ b/src/irc/channellistpanel.h
@@ -50,7 +50,7 @@
void setFilterChannel(bool filter);
protected:
- bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
private:
bool usersInRange(int users) const;
@@ -69,11 +69,11 @@
void append(const ChannelItem& item);
- int columnCount(const QModelIndex& parent = QModelIndex()) const;
- int rowCount(const QModelIndex& parent = QModelIndex()) const;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
- QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
- QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
private:
QList m_channelList;
@@ -89,10 +89,10 @@
using ChatWindow::closeYourself;
virtual bool closeYourself();
- virtual void emitUpdateInfo();
+ void emitUpdateInfo() Q_DECL_OVERRIDE;
- bool isInsertSupported() { return true; }
- QString getTextInLine() { return m_filterLine->text(); }
+ bool isInsertSupported() Q_DECL_OVERRIDE { return true; }
+ QString getTextInLine() Q_DECL_OVERRIDE { return m_filterLine->text(); }
Q_SIGNALS:
void refreshChannelList();
@@ -104,7 +104,7 @@
void endOfChannelList();
void applyFilterClicked();
- virtual void appendInputText(const QString&, bool fromCursor);
+ void appendInputText(const QString&, bool fromCursor) Q_DECL_OVERRIDE;
void setFilter(const QString& filter);
protected Q_SLOTS:
@@ -121,12 +121,12 @@
void contextMenu(const QPoint& pos);
void openURL();
//Used to disable functions when not connected
- virtual void serverOnline(bool online);
+ void serverOnline(bool online) Q_DECL_OVERRIDE;
protected:
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus(){}
+ void childAdjustFocus()Q_DECL_OVERRIDE {}
void countUsers(const QModelIndex& index, int pos);
diff --git a/src/irc/invitedialog.h b/src/irc/invitedialog.h
--- a/src/irc/invitedialog.h
+++ b/src/irc/invitedialog.h
@@ -43,14 +43,14 @@
void addInvite(const QString& nickname, const QString& channel);
QString selectedChannels() const;
- virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
- virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
+ int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
- virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
- virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
- virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
- virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
+ bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
private:
QMap m_channelMap;
diff --git a/src/irc/nick.h b/src/irc/nick.h
--- a/src/irc/nick.h
+++ b/src/irc/nick.h
@@ -31,8 +31,8 @@
ChannelNickPtr getChannelNick() const;
- virtual QVariant data(int column, int role) const;
- virtual bool operator<(const QTreeWidgetItem& other) const;
+ QVariant data(int column, int role) const Q_DECL_OVERRIDE;
+ bool operator<(const QTreeWidgetItem& other) const Q_DECL_OVERRIDE;
void refresh();
void repositionMe();
diff --git a/src/irc/nicklistview.h b/src/irc/nicklistview.h
--- a/src/irc/nicklistview.h
+++ b/src/irc/nicklistview.h
@@ -70,15 +70,15 @@
protected:
//! Reimplemented for dynamic tooltips
- virtual bool event(QEvent* ev);
- virtual void contextMenuEvent(QContextMenuEvent* ev);
+ bool event(QEvent* ev) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent* ev) Q_DECL_OVERRIDE;
// Drag & Drop support
- virtual QStringList mimeTypes () const;
+ QStringList mimeTypes () const Q_DECL_OVERRIDE;
bool canDecodeMime(QDropEvent const *event) const;
- virtual bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action);
- virtual void dragEnterEvent(QDragEnterEvent *event);
- virtual void dragMoveEvent(QDragMoveEvent *event);
+ bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action) Q_DECL_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
+ void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
Channel *channel;
QTimer *m_resortTimer;
diff --git a/src/irc/nicklistview.cpp b/src/irc/nicklistview.cpp
--- a/src/irc/nicklistview.cpp
+++ b/src/irc/nicklistview.cpp
@@ -31,7 +31,7 @@
public:
NickItemDelegate(QObject *parent = 0);
- virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const;
+ QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_OVERRIDE;
};
NickItemDelegate::NickItemDelegate(QObject *parent)
diff --git a/src/irc/nicksonline.h b/src/irc/nicksonline.h
--- a/src/irc/nicksonline.h
+++ b/src/irc/nicksonline.h
@@ -53,7 +53,7 @@
QTreeWidget* getNickListView();
NickInfoPtr getNickInfo(const QTreeWidgetItem* item);
- virtual bool canBeFrontView() { return true; }
+ bool canBeFrontView() Q_DECL_OVERRIDE { return true; }
Q_SIGNALS:
/**
@@ -104,9 +104,9 @@
protected:
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
//! Reimplemented for dynamic tooltips
- virtual bool eventFilter(QObject*obj, QEvent *ev);
+ bool eventFilter(QObject*obj, QEvent *ev) Q_DECL_OVERRIDE;
private:
/**
* Returns the named child of parent item in a NicksOnlineItem
diff --git a/src/irc/nicksonlineitem.h b/src/irc/nicksonlineitem.h
--- a/src/irc/nicksonlineitem.h
+++ b/src/irc/nicksonlineitem.h
@@ -39,7 +39,7 @@
* @param item Pointer to the QTreeWidgetItem to compare with.
* @return -1 if this item's value is smaller than i, 0 if they are equal, 1 if it's greater
*/
- bool operator<(const QTreeWidgetItem &item) const;
+ bool operator<(const QTreeWidgetItem &item) const Q_DECL_OVERRIDE;
/**
* Returns the type of the item.
* @return One of the enum NickListViewColumn
diff --git a/src/irc/query.h b/src/irc/query.h
--- a/src/irc/query.h
+++ b/src/irc/query.h
@@ -42,7 +42,7 @@
public:
explicit Query(QWidget* parent, const QString& _name);
- virtual void setServer(Server* newServer);
+ void setServer(Server* newServer) Q_DECL_OVERRIDE;
~Query();
@@ -55,14 +55,14 @@
* This should be fixed maybe? I don't know.
*/
NickInfoPtr getNickInfo();
- virtual bool closeYourself(bool askForConfirmation=true);
- virtual bool canBeFrontView();
- virtual bool searchView();
+ bool closeYourself(bool askForConfirmation=true) Q_DECL_OVERRIDE;
+ bool canBeFrontView() Q_DECL_OVERRIDE;
+ bool searchView() Q_DECL_OVERRIDE;
- virtual void setChannelEncoding(const QString& encoding);
- virtual QString getChannelEncoding();
- virtual QString getChannelEncodingDefaultDesc();
- virtual void emitUpdateInfo();
+ void setChannelEncoding(const QString& encoding) Q_DECL_OVERRIDE;
+ QString getChannelEncoding() Q_DECL_OVERRIDE;
+ QString getChannelEncodingDefaultDesc() Q_DECL_OVERRIDE;
+ void emitUpdateInfo() Q_DECL_OVERRIDE;
/** call this when you see a nick quit from the server.
* @param reason The quit reason given by that user.
@@ -78,8 +78,8 @@
void updateQueryChrome(ChatWindow*, const QString&);
public Q_SLOTS:
- void sendText(const QString& text);
- virtual void indicateAway(bool show);
+ void sendText(const QString& text) Q_DECL_OVERRIDE;
+ void indicateAway(bool show) Q_DECL_OVERRIDE;
void setEncryptedOutput(bool);
void connectionStateChanged(Server*, Konversation::ConnectionState);
@@ -94,10 +94,10 @@
void updateNickInfo(Server* server, NickInfoPtr nickInfo);
protected:
- void setName(const QString& newName);
- void showEvent(QShowEvent* event);
+ void setName(const QString& newName) Q_DECL_OVERRIDE;
+ void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
private:
bool awayChanged;
diff --git a/src/irc/servergroupdialog.h b/src/irc/servergroupdialog.h
--- a/src/irc/servergroupdialog.h
+++ b/src/irc/servergroupdialog.h
@@ -44,7 +44,7 @@
bool identitiesNeedsUpdate() const { return m_identitiesNeedsUpdate; }
public Q_SLOTS:
- virtual void accept();
+ void accept() Q_DECL_OVERRIDE;
protected Q_SLOTS:
void addServer();
diff --git a/src/irc/serverlistdialog.h b/src/irc/serverlistdialog.h
--- a/src/irc/serverlistdialog.h
+++ b/src/irc/serverlistdialog.h
@@ -29,7 +29,7 @@
public:
ServerListItem(QTreeWidget* tree, QStringList & strings);
ServerListItem(QTreeWidgetItem* parent, QStringList & strings);
- bool operator<(const QTreeWidgetItem &other) const;
+ bool operator<(const QTreeWidgetItem &other) const Q_DECL_OVERRIDE;
enum DataRole
{
SortIndex = Qt::UserRole + 2
diff --git a/src/irc/serverlistview.h b/src/irc/serverlistview.h
--- a/src/irc/serverlistview.h
+++ b/src/irc/serverlistview.h
@@ -34,10 +34,10 @@
void aboutToMove();
protected:
- void dragMoveEvent(QDragMoveEvent *e);
- void dragLeaveEvent(QDragLeaveEvent *);
- void dragEnterEvent(QDragEnterEvent *);
- void dropEvent(QDropEvent *event);
+ void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
+ void dragLeaveEvent(QDragLeaveEvent *) Q_DECL_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent *) Q_DECL_OVERRIDE;
+ void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
};
#endif
diff --git a/src/irc/topichistorymodel.h b/src/irc/topichistorymodel.h
--- a/src/irc/topichistorymodel.h
+++ b/src/irc/topichistorymodel.h
@@ -68,11 +68,11 @@
void clearCipher();
#endif
- QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
- QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- int columnCount(const QModelIndex& parent = QModelIndex()) const;
- int rowCount(const QModelIndex& parent = QModelIndex()) const;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
static QString authorPlaceholder();
diff --git a/src/konsolepanel.h b/src/konsolepanel.h
--- a/src/konsolepanel.h
+++ b/src/konsolepanel.h
@@ -29,7 +29,7 @@
explicit KonsolePanel(QWidget *p);
~KonsolePanel();
- virtual void setName(const QString& newName) { ChatWindow::setName(newName); }
+ void setName(const QString& newName) Q_DECL_OVERRIDE { ChatWindow::setName(newName); }
QWidget* getWidget();
@@ -41,7 +41,7 @@
void manageKonsoleProfiles();
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
protected Q_SLOTS:
void konsoleChanged(const QString& data);
diff --git a/src/mainwindow.h b/src/mainwindow.h
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -106,17 +106,17 @@
void toggleVisibility();
- void showEvent(QShowEvent* e);
- void hideEvent(QHideEvent* e);
- void leaveEvent(QEvent* e);
+ void showEvent(QShowEvent* e) Q_DECL_OVERRIDE;
+ void hideEvent(QHideEvent* e) Q_DECL_OVERRIDE;
+ void leaveEvent(QEvent* e) Q_DECL_OVERRIDE;
protected:
- virtual QSize sizeHint() const;
+ QSize sizeHint() const Q_DECL_OVERRIDE;
int confirmQuit();
- bool queryClose();
- virtual bool event(QEvent* e);
+ bool queryClose() Q_DECL_OVERRIDE;
+ bool event(QEvent* e) Q_DECL_OVERRIDE;
ViewContainer* m_viewContainer;
Konversation::StatusBar* m_statusBar;
diff --git a/src/notificationhandler.cpp b/src/notificationhandler.cpp
--- a/src/notificationhandler.cpp
+++ b/src/notificationhandler.cpp
@@ -21,6 +21,7 @@
#include "transfer.h"
#include
+#include
#include
#include
@@ -51,10 +52,11 @@
(!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()));
QString eventTitle = i18nc("Notification title; see Event/message in konversation.notifyrc", "New message from %1 in %2", fromNick, chatWin->getName());
+ KNotification* msg;
if (message.isEmpty())
{
- KNotification::event(QLatin1String("message"), eventTitle, QString(QStringLiteral("<%1>")).arg(fromNick), QPixmap(), m_mainWindow);
+ msg = KNotification::event(QLatin1String("message"), eventTitle, QStringLiteral("<%1>").arg(fromNick), QPixmap(), m_mainWindow);
if (osd)
{
@@ -68,7 +70,7 @@
QString cleanedMessage = removeIrcMarkup(message);
QString forKNotify = cleanedMessage.toHtmlEscaped();
- KNotification::event(QLatin1String("message"), eventTitle, QString(QStringLiteral("<%1> %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
+ msg = KNotification::event(QLatin1String("message"), eventTitle, QString(QStringLiteral("<%1> %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
if (osd)
{
@@ -78,6 +80,9 @@
}
}
+ msg->setDefaultAction(i18n("Open"));
+ connect(msg, static_cast(&KNotification::activated), chatWin, &ChatWindow::activateView);
+
if (!Preferences::self()->trayNotifyOnlyOwnNick())
{
startTrayNotification(chatWin);
@@ -98,9 +103,10 @@
QString eventTitle = i18nc("Notification title; see Event/nick in konversation.notifyrc", "Your nick was mentioned by %1 in %2", fromNick, chatWin->getName());
+ KNotification* msg;
if (message.isEmpty())
{
- KNotification::event(QLatin1String("nick"), eventTitle, QString(QStringLiteral("<%1>")).arg(fromNick), QPixmap(), m_mainWindow);
+ msg = KNotification::event(QLatin1String("nick"), eventTitle, QString(QStringLiteral("<%1>")).arg(fromNick), QPixmap(), m_mainWindow);
if (osd)
{
@@ -114,7 +120,7 @@
QString cleanedMessage = removeIrcMarkup(message);
QString forKNotify = cleanedMessage.toHtmlEscaped();
- KNotification::event(QLatin1String("nick"), eventTitle, QString(QStringLiteral("<%1> %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
+ msg = KNotification::event(QLatin1String("nick"), eventTitle, QString(QStringLiteral("<%1> %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
if (osd)
{
@@ -124,6 +130,9 @@
}
}
+ msg->setDefaultAction(i18n("Open"));
+ connect(msg, static_cast(&KNotification::activated), chatWin, &ChatWindow::activateView);
+
startTrayNotification(chatWin);
}
@@ -141,9 +150,10 @@
QString eventTitle = i18nc("Notification title; see Event/message in konversation.notifyrc", "New query message from %1", chatWin->getName());
+ KNotification* msg;
if (message.isEmpty()) // TODO document how this can happen, seems nonsensical
{
- KNotification::event(QLatin1String("queryMessage"), eventTitle, QString(QStringLiteral("<%1>")).arg(fromNick), QPixmap(), m_mainWindow);
+ msg = KNotification::event(QLatin1String("queryMessage"), eventTitle, QString(QStringLiteral("<%1>")).arg(fromNick), QPixmap(), m_mainWindow);
if (osd)
{
@@ -157,7 +167,7 @@
QString cleanedMessage = removeIrcMarkup(message);
QString forKNotify = cleanedMessage.toHtmlEscaped();
- KNotification::event(QLatin1String("queryMessage"), eventTitle, QString(QStringLiteral("<%1> %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
+ msg = KNotification::event(QLatin1String("queryMessage"), eventTitle, QString(QStringLiteral("<%1> %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
if (osd)
{
@@ -167,6 +177,9 @@
}
}
+ msg->setDefaultAction(i18n("Open"));
+ connect(msg, static_cast(&KNotification::activated), chatWin, &ChatWindow::activateView);
+
startTrayNotification(chatWin);
}
diff --git a/src/queuetuner.h b/src/queuetuner.h
--- a/src/queuetuner.h
+++ b/src/queuetuner.h
@@ -31,7 +31,7 @@
public:
QueueTuner(QWidget* parent, ViewContainer *container);
~QueueTuner();
- virtual void contextMenuEvent (QContextMenuEvent*);
+ void contextMenuEvent (QContextMenuEvent*) Q_DECL_OVERRIDE;
public Q_SLOTS:
void setServer(Server* newServer);
diff --git a/src/ssllabel.h b/src/ssllabel.h
--- a/src/ssllabel.h
+++ b/src/ssllabel.h
@@ -25,7 +25,7 @@
explicit SSLLabel(QWidget* parent);
protected:
- void mouseReleaseEvent(QMouseEvent *e);
+ void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
Q_SIGNALS:
void clicked();
diff --git a/src/upnp/upnpdescriptionparser.cpp b/src/upnp/upnpdescriptionparser.cpp
--- a/src/upnp/upnpdescriptionparser.cpp
+++ b/src/upnp/upnpdescriptionparser.cpp
@@ -40,12 +40,12 @@
virtual ~XMLContentHandler();
- bool startDocument();
- bool endDocument();
+ bool startDocument() Q_DECL_OVERRIDE;
+ bool endDocument() Q_DECL_OVERRIDE;
bool startElement(const QString &, const QString & localName, const QString &,
- const QXmlAttributes & atts);
- bool endElement(const QString & , const QString & localName, const QString & );
- bool characters(const QString & ch);
+ const QXmlAttributes & atts) Q_DECL_OVERRIDE;
+ bool endElement(const QString & , const QString & localName, const QString & ) Q_DECL_OVERRIDE;
+ bool characters(const QString & ch) Q_DECL_OVERRIDE;
bool interestingDeviceField(const QString & name);
bool interestingServiceField(const QString & name);
diff --git a/src/urlcatcher.h b/src/urlcatcher.h
--- a/src/urlcatcher.h
+++ b/src/urlcatcher.h
@@ -41,7 +41,7 @@
explicit UrlDateItem(const QDateTime& dateTime);
~UrlDateItem();
- QVariant data(int role) const;
+ QVariant data(int role) const Q_DECL_OVERRIDE;
};
@@ -53,11 +53,11 @@
explicit UrlSortFilterProxyModel(QObject* parent = 0);
~UrlSortFilterProxyModel();
- Qt::ItemFlags flags(const QModelIndex& index) const;
+ Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
protected:
- bool lessThan(const QModelIndex& left, const QModelIndex& right) const;
+ bool lessThan(const QModelIndex& left, const QModelIndex& right) const Q_DECL_OVERRIDE;
};
@@ -71,8 +71,8 @@
protected:
- void childAdjustFocus();
- bool event(QEvent* event);
+ void childAdjustFocus() Q_DECL_OVERRIDE;
+ bool event(QEvent* event) Q_DECL_OVERRIDE;
private Q_SLOTS:
diff --git a/src/version.h b/src/version.h
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
#ifndef KONVI_VERSION
-#define KONVI_VERSION "1.7-branch"
+#define KONVI_VERSION "1.7-master"
#endif
diff --git a/src/viewer/channeloptionsdialog.h b/src/viewer/channeloptionsdialog.h
--- a/src/viewer/channeloptionsdialog.h
+++ b/src/viewer/channeloptionsdialog.h
@@ -64,8 +64,8 @@
void topicBeingEdited(bool edited);
protected:
- void showEvent(QShowEvent* event);
- void hideEvent(QHideEvent* event);
+ void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+ void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
bool m_editingTopic;
bool m_isAnyTypeOfOp;
@@ -81,7 +81,7 @@
explicit BanListViewItem( QTreeWidget *parent );
BanListViewItem(QTreeWidget *parent, const QString& label1, const QString& label2 = QString(), uint timestamp = 0);
- bool operator<(const QTreeWidgetItem &item) const;
+ bool operator<(const QTreeWidgetItem &item) const Q_DECL_OVERRIDE;
protected:
QDateTime m_timestamp;
diff --git a/src/viewer/chatwindow.h b/src/viewer/chatwindow.h
--- a/src/viewer/chatwindow.h
+++ b/src/viewer/chatwindow.h
@@ -108,7 +108,7 @@
virtual bool notificationsEnabled() { return m_notificationsEnabled; }
- virtual bool eventFilter(QObject* watched, QEvent* e);
+ bool eventFilter(QObject* watched, QEvent* e) Q_DECL_OVERRIDE;
QString logFileName() { return logfile.fileName(); }
@@ -139,6 +139,7 @@
void setMargin(int margin) { layout()->setMargin(margin); }
void setSpacing(int spacing) { layout()->setSpacing(spacing); }
+ void activateView();
Q_SIGNALS:
void nameChanged(ChatWindow* view, const QString& newName);
@@ -153,6 +154,7 @@
void clearStatusBarTempText();
void closing(ChatWindow* myself);
+ void showView(ChatWindow* myself);
public Q_SLOTS:
void updateAppearance();
@@ -180,7 +182,7 @@
virtual void serverOnline(bool online);
protected:
- virtual void childEvent(QChildEvent* event);
+ void childEvent(QChildEvent* event) Q_DECL_OVERRIDE;
/** Some children may handle the name themselves, and not want this public.
* Increase the visibility in the subclass if you want outsiders to call this.
diff --git a/src/viewer/chatwindow.cpp b/src/viewer/chatwindow.cpp
--- a/src/viewer/chatwindow.cpp
+++ b/src/viewer/chatwindow.cpp
@@ -749,4 +749,14 @@
}
}
+void ChatWindow::activateView()
+{
+ for(QWidget* widget = this; widget; widget = widget->parentWidget()) {
+ if (widget->window()) {
+ widget->show();
+ widget->activateWindow();
+ widget->raise();
+ }
+ }
+}
diff --git a/src/viewer/images.cpp b/src/viewer/images.cpp
--- a/src/viewer/images.cpp
+++ b/src/viewer/images.cpp
@@ -33,9 +33,9 @@
}
// QIconEngine
- virtual void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state);
- virtual QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state);
- virtual QIconEngine* clone() const;
+ void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
+ QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
+ QIconEngine* clone() const Q_DECL_OVERRIDE;
private:
const QColor m_color;
diff --git a/src/viewer/ircinput.h b/src/viewer/ircinput.h
--- a/src/viewer/ircinput.h
+++ b/src/viewer/ircinput.h
@@ -34,12 +34,12 @@
QString lastCompletion() const { return m_lastCompletion; }
void doInlineAutoreplace();
- virtual QSize sizeHint() const;
- virtual QSize minimumSizeHint() const;
+ QSize sizeHint() const Q_DECL_OVERRIDE;
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE;
- virtual bool event(QEvent* e);
+ bool event(QEvent* e) Q_DECL_OVERRIDE;
- virtual void createHighlighter();
+ void createHighlighter() Q_DECL_OVERRIDE;
Q_SIGNALS:
void nickCompletion();
@@ -65,16 +65,16 @@
void maybeResize();
protected:
- bool eventFilter(QObject *object,QEvent *event);
+ bool eventFilter(QObject *object,QEvent *event) Q_DECL_OVERRIDE;
void addHistory(const QString& text);
bool checkPaste(QString& text);
- virtual void insertFromMimeData(const QMimeData *source);
- virtual void keyPressEvent(QKeyEvent* e);
- virtual void wheelEvent(QWheelEvent* e);
- virtual void showEvent(QShowEvent* e);
- virtual void hideEvent(QHideEvent* e);
- virtual void resizeEvent(QResizeEvent* e);
+ void insertFromMimeData(const QMimeData *source) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent* e) Q_DECL_OVERRIDE;
+ void wheelEvent(QWheelEvent* e) Q_DECL_OVERRIDE;
+ void showEvent(QShowEvent* e) Q_DECL_OVERRIDE;
+ void hideEvent(QHideEvent* e) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent* e) Q_DECL_OVERRIDE;
QStringList historyList;
int lineNum;
diff --git a/src/viewer/ircview.h b/src/viewer/ircview.h
--- a/src/viewer/ircview.h
+++ b/src/viewer/ircview.h
@@ -36,8 +36,8 @@
public:
IrcViewMarkerLine(QObject *p) : QObject(p), QTextObjectInterface() {}
~IrcViewMarkerLine() {}
- virtual void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format);
- virtual QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format);
+ void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE;
+ QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE;
};
/// Helper struct which remembers the openHtmlTags, the fore and
@@ -125,10 +125,10 @@
void clearLines();
protected:
- virtual QMimeData* createMimeDataFromSelection() const;
- virtual void dragEnterEvent(QDragEnterEvent* e);
- virtual void dragMoveEvent(QDragMoveEvent* e);
- virtual void dropEvent(QDropEvent* e);
+ QMimeData* createMimeDataFromSelection() const Q_DECL_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent* e) Q_DECL_OVERRIDE;
+ void dragMoveEvent(QDragMoveEvent* e) Q_DECL_OVERRIDE;
+ void dropEvent(QDropEvent* e) Q_DECL_OVERRIDE;
private:
/// The internal mechanics of inserting a line.
@@ -277,18 +277,24 @@
inline QString getColors(const QString& text, int start, QString& _fgColor, QString& _bgColor, bool* invalidFgVal, bool* invalidBgValue);
protected:
- virtual void resizeEvent(QResizeEvent *event);
- virtual void mouseReleaseEvent(QMouseEvent* ev);
- virtual void mousePressEvent(QMouseEvent* ev);
- virtual void mouseMoveEvent(QMouseEvent* ev);
- virtual void keyPressEvent(QKeyEvent* ev);
- virtual void contextMenuEvent(QContextMenuEvent* ev);
- virtual void wheelEvent(QWheelEvent* ev);
+ void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(QMouseEvent* ev) Q_DECL_OVERRIDE;
+ void mousePressEvent(QMouseEvent* ev) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent* ev) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent* ev) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent* ev) Q_DECL_OVERRIDE;
+ void wheelEvent(QWheelEvent* ev) Q_DECL_OVERRIDE;
QChar::Direction basicDirection(const QString &string);
+ /// Returns true if the timestamp string is RTL, otherwise false
+ bool dateRtlDirection();
+
+ /// Format the line by adding needed bidi marks
+ QString formatFinalLine(bool rtl, QString lineColor, QString label, QString nickLine, QString nickStar, QString text);
+
/// Returns a formated timestamp if timestamps are enabled else it returns QString::null
- QString timeStamp(QHash messageTags);
+ QString timeStamp(QHash messageTags, bool rtl);
/// Returns a formated nick string
//! FIXME formatted in what way?
diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
--- a/src/viewer/ircview.cpp
+++ b/src/viewer/ircview.cpp
@@ -217,10 +217,10 @@
{
public:
IrcViewMimeData(const QTextDocumentFragment& _fragment): fragment(_fragment) {}
- virtual QStringList formats() const;
+ QStringList formats() const Q_DECL_OVERRIDE;
protected:
- virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const;
+ QVariant retrieveData(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE;
private:
mutable QTextDocumentFragment fragment;
@@ -536,6 +536,63 @@
viewport()->setPalette(p);
}
+bool IRCView::dateRtlDirection()
+{
+ // Keep format synced with IRCView::timeStamp
+ return QLocale().toString(QDate::currentDate(), QLocale::ShortFormat).isRightToLeft();
+}
+
+// To minimize the use of bidi marks, for cases below, some bidi marks are
+// needed.
+// * left aligned lines in LTR locales, and
+// * right aligned lines in RTL locales
+//
+// First, check if the direction of the message is the same as the
+// direction of the timestamp, if not, then add a mark depending on
+// message's direction, so that timestamp don't be first strong character.
+//
+// If we have a LTR label, and the message is right-aligned, we prepend
+// it with LRM to look correct (check nickname case below), and then append
+// it with LRM also and then a RLM to preserve the direction of the
+// right-aligned line.
+//
+// Later, if the message is RTL, nicknames like "_nick]" will appear
+// as "[nick_".
+// First, add a LRM mark to make underscore on the left, next add the
+// nickname, and then another LRM mark. Since we use RTL/LTR count, the
+// message may start with a LTR word, and appear to the right of the
+// nickname. That's why we add a RLM mark before the nick to force it
+// appearing on left.
+QString IRCView::formatFinalLine(bool rtl, QString lineColor, QString label, QString nickLine, QString nickStar, QString text)
+{
+ // Nick correctly displayed: <_nick]>
+ QString line;
+ // It's right-aligned under LTR locale, or left-aligned under RTL locale
+ if (!rtl == dateRtlDirection())
+ line += (rtl ? RLM : LRM);
+ if (!label.isEmpty()) { // Label correctly displayed: [_label.]
+ if (rtl) line += LRM; // [.label_] -> [._label]
+ line += "[%4]";
+ if (!label.isRightToLeft() == rtl)
+ line += LRM + RLM; // [._label] -> [_label.]
+ }
+ line += "%1";
+ if (!nickStar.isEmpty()) // Used for [timeStamp] * nick action
+ line += nickStar;
+ if (rtl) line += LRM; // <[nick_> -> <[_nick]>
+ line += nickLine;
+ if (rtl)
+ {
+ line += LRM; // <[_nick]> -> <_nick]>
+ // It might start with an English word, but it's RTL because of counting
+ if (!text.isEmpty() && !text.isRightToLeft())
+ line += RLM; // ARABIC_TEXT <_nick]> Hi -> ARABIC_TEXT Hi <_nick]>
+ }
+ if (text.isEmpty()) line += "";
+ else line += " %3";
+
+ return line;
+}
// Data insertion
@@ -552,13 +609,10 @@
QString line;
bool rtl = (dir == QChar::DirR);
- QChar directionOfLine = rtl ? RLM : LRM;
- line = directionOfLine;
- if (!label.isEmpty()) {
- line += "[%4]";
- }
- line += "%1" + directionOfLine + nickLine + directionOfLine + " %3";
- line = line.arg(timeStamp(messageTags), nick, text);
+ // Normal chat lines
+ // [timestamp] chat message
+ line = formatFinalLine(rtl, channelColor, label, nickLine, QString(), text);
+ line = line.arg(timeStamp(messageTags, rtl), nick, text);
if (!label.isEmpty())
{
@@ -576,7 +630,15 @@
: Preferences::self()->color(Preferences::ServerMessage);
m_tabNotification = Konversation::tnfNone;
- QString line = QString(timeStamp(QHash()) + " " + message + "");
+ // Raw log is always left-aligned
+ // [timestamp] << server line
+ // If the timedate string is RTL, prepend a LTR mark to force the direction
+ // to be LTR, as the datetime string is already returned as it's for a
+ // left-aligned line.
+
+ QString line;
+ if (dateRtlDirection()) line += LRM;
+ line += (timeStamp(QHash(), false) + " " + message + "");
doAppend(line, false, self);
}
@@ -586,9 +648,12 @@
QColor channelColor = Preferences::self()->color(Preferences::ChannelMessage);
m_tabNotification = Konversation::tnfNone;
+ // Log view is plain log files.
+ // Direction will be depending on the logfile line direction.
+
QString line("" + message + "");
- doRawAppend(line, !QApplication::isLeftToRight());
+ doRawAppend(line, message.isRightToLeft());
}
void IRCView::appendQuery(const QString& nick, const QString& message, const QHash &messageTags, bool inChannel)
@@ -604,9 +669,10 @@
QString text(filter(message, queryColor, nick, true, true, false, &dir));
bool rtl = (dir == QChar::DirR);
- QChar directionOfLine = rtl ? RLM : LRM;
- line = directionOfLine + "%1" + directionOfLine + nickLine + directionOfLine + " %3";
- line = line.arg(timeStamp(messageTags), nick, text);
+ // Private chat lines
+ // [timestamp] chat message
+ line = formatFinalLine(rtl, queryColor, QString(), nickLine, QString(), text);
+ line = line.arg(timeStamp(messageTags, rtl), nick, text);
if (inChannel) {
emit textToLog(QString("<-> %1>\t%2").arg(nick, message));
@@ -639,23 +705,28 @@
if (message.isEmpty())
{
- line = LRM + "%1 * " + nickLine + "";
+ // No text to check direction. Better to check last line, if it's RTL,
+ // treat it as that.
+ QTextCursor formatCursor(document()->lastBlock());
+ bool rtl = (formatCursor.blockFormat().alignment().testFlag(Qt::AlignRight));
- line = line.arg(timeStamp(messageTags), nick);
+ line = formatFinalLine(rtl, actionColor, QString(), nickLine, QString(" * "), QString());
+ line = line.arg(timeStamp(messageTags, rtl), nick);
emit textToLog(QString("\t * %1").arg(nick));
- doAppend(line, false);
+ doAppend(line, rtl);
}
else
{
QChar::Direction dir;
QString text(filter(message, actionColor, nick, true,true, false, &dir));
bool rtl = (dir == QChar::DirR);
- QChar directionOfLine = rtl ? RLM : LRM;
- line = directionOfLine + "%1 " + directionOfLine + "* " + nickLine + directionOfLine + " %3";
- line = line.arg(timeStamp(messageTags), nick, text);
+ // Actions line
+ // [timestamp] * nickname action
+ line = formatFinalLine(rtl, actionColor, QString(), nickLine, QString(" * "), text);
+ line = line.arg(timeStamp(messageTags, rtl), nick, text);
emit textToLog(QString("\t * %1 %2").arg(nick, message));
@@ -679,11 +750,17 @@
QString line;
QChar::Direction dir;
QString text(filter(message, serverColor, 0 , true, parseURL, false, &dir));
- bool rtl = (dir == QChar::DirR);
+ // Server text may be translated strings. It's not user input: treat with first strong.
+ bool rtl = text.isRightToLeft();
- QChar directionOfLine = rtl ? RLM : LRM;
- line = directionOfLine + "%1 " + directionOfLine + "[%2]" + directionOfLine + " %3";
- line = line.arg(timeStamp(messageTags), type, text);
+ // It's right-aligned under LTR locale, or left-aligned under RTL locale
+ if (!rtl == dateRtlDirection())
+ line += (rtl ? RLM : LRM);
+ line += "%1 [%2]";
+ if (!rtl == type.isRightToLeft())
+ line += (rtl ? RLM : LRM); // [50 [ARABIC_TEXT users -> [ARABIC_TEXT] 50 users
+ line += " %3";
+ line = line.arg(timeStamp(messageTags, rtl), type, text);
emit textToLog(QString("%1\t%2").arg(type, message));
@@ -711,11 +788,14 @@
QString line;
QChar::Direction dir;
QString text(filter(message, commandColor, 0, true, parseURL, self, &dir));
+ // Commands are translated and contain LTR IP addresses. Treat with first strong.
bool rtl = text.isRightToLeft();
- QChar directionOfLine = rtl ? RLM : LRM;
- line = directionOfLine + "%1 %2 %3";
- line = line.arg(timeStamp(messageTags), prefix, text);
+ // It's right-aligned under LTR locale, or left-aligned under RTL locale
+ if (!rtl == dateRtlDirection())
+ line += (rtl ? RLM : LRM);
+ line += "%1 %2 %3";
+ line = line.arg(timeStamp(messageTags, rtl), prefix, text);
emit textToLog(QString("%1\t%2").arg(type, message));
@@ -739,10 +819,6 @@
{
nick = '|' + nick + '|';
}
- else //It's a real nick
- {
- nick = LRM + nick + LRM;
- }
// Nicks are in "" format so replace the "<>"
nick.replace('<',"<");
@@ -753,8 +829,34 @@
QString text(filter(message, backlogColor, NULL, false, false, false, &dir));
bool rtl = nick.startsWith('|') ? text.isRightToLeft() : (dir == QChar::DirR);
- QChar directionOfLine = rtl ? RLM : LRM;
- line = directionOfLine + "%1 " + directionOfLine + "%2" + directionOfLine + " %3";
+ // It's right-aligned under LTR locale, or left-aligned under RTL locale
+ if (!rtl == time.isRightToLeft())
+ line += (rtl ? RLM : LRM);
+
+ line += "";
+ // Prepend and append timestamp's correct bidi mark if the time and text
+ // directions are different.
+ if (rtl == time.isRightToLeft())
+ line += "%1";
+ else
+ line += (time.isRightToLeft() ? RLM+"%1"+RLM : LRM+"%1"+LRM);
+
+ // Partially copied from IRCView::formatFinalLine
+ if (rtl)
+ {
+ // Return back to the normal direction after setting mark
+ if (!rtl == time.isRightToLeft()) line += (!time.isRightToLeft() ? RLM : LRM);
+ line += LRM; // <[nick_> -> <[_nick]>
+ }
+ line += "%2";
+ if (rtl)
+ {
+ line += LRM; // <[_nick]> -> <_nick]>
+ if (!text.isRightToLeft())
+ line += RLM; // ARABIC_TEXT <_nick]> Hi -> ARABIC_TEXT Hi <_nick]>
+ }
+
+ line += " %3";
line = line.arg(time, nick, text);
doAppend(line, rtl);
@@ -813,7 +915,7 @@
formatCursor.setBlockFormat(format);
}
-QString IRCView::timeStamp(QHash messageTags)
+QString IRCView::timeStamp(QHash messageTags, bool rtl)
{
if(Preferences::self()->timestamping())
{
@@ -827,8 +929,7 @@
QString timeFormat = Preferences::self()->timestampFormat();
QString timeString;
- bool rtlLocale = (QLocale().zeroDigit() == QChar((ushort)0x0660)) || // ARABIC-INDIC DIGIT ZERO
- (QLocale().zeroDigit() == QChar((ushort)0x06F0)); // EXTENDED ARABIC-INDIC DIGIT ZERO
+ bool dateRtl = dateRtlDirection();
if(!Preferences::self()->showDate())
{
@@ -839,10 +940,10 @@
QDate date = serverTime.isValid() ? serverTime.date() : QDate::currentDate();
timeString = QString("[%1%2 %3%4] ")
- .arg(rtlLocale ? RLM : LRM,
- QLocale().toString(date, QLocale::ShortFormat),
- time.toString(timeFormat),
- !rtlLocale ? RLM : LRM);
+ .arg((dateRtl==rtl) ? QString() : (dateRtl ? RLM : LRM),
+ QLocale().toString(date, QLocale::ShortFormat),
+ time.toString(timeFormat),
+ (dateRtl==rtl) ? QString() : (!dateRtl ? RLM : LRM));
}
return timeString;
@@ -853,7 +954,7 @@
QString IRCView::createNickLine(const QString& nick, const QString& defaultColor, bool encapsulateNick, bool privMsg)
{
- QString nickLine = LRM + "%2" + LRM;
+ QString nickLine ="%2";
QString nickColor;
if (Preferences::self()->useColoredNicks())
diff --git a/src/viewer/logfilereader.h b/src/viewer/logfilereader.h
--- a/src/viewer/logfilereader.h
+++ b/src/viewer/logfilereader.h
@@ -34,9 +34,9 @@
using ChatWindow::closeYourself;
virtual bool closeYourself() { closeLog(); return true; }
- virtual bool searchView();
+ bool searchView() Q_DECL_OVERRIDE;
- virtual bool eventFilter(QObject* watched, QEvent* e);
+ bool eventFilter(QObject* watched, QEvent* e) Q_DECL_OVERRIDE;
protected Q_SLOTS:
@@ -53,7 +53,7 @@
int spacing();
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
KToolBar* toolBar;
QSpinBox* sizeSpin;
diff --git a/src/viewer/osd.h b/src/viewer/osd.h
--- a/src/viewer/osd.h
+++ b/src/viewer/osd.h
@@ -71,10 +71,10 @@
QRect determineMetrics( const int M );
// Reimplemented from QWidget
- virtual void paintEvent( QPaintEvent* );
- virtual void mousePressEvent( QMouseEvent* );
- void resizeEvent( QResizeEvent *e );
- virtual bool event( QEvent* );
+ void paintEvent( QPaintEvent* ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent* ) Q_DECL_OVERRIDE;
+ void resizeEvent( QResizeEvent *e ) Q_DECL_OVERRIDE;
+ bool event( QEvent* ) Q_DECL_OVERRIDE;
/** distance from screen edge */
static const int MARGIN = 15;
@@ -124,9 +124,9 @@
void positionChanged();
protected:
- void mousePressEvent( QMouseEvent * );
- void mouseReleaseEvent( QMouseEvent * );
- void mouseMoveEvent( QMouseEvent * );
+ void mousePressEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
+ void mouseMoveEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
private:
bool m_dragging;
diff --git a/src/viewer/rawlog.h b/src/viewer/rawlog.h
--- a/src/viewer/rawlog.h
+++ b/src/viewer/rawlog.h
@@ -30,16 +30,16 @@
using ChatWindow::closeYourself;
virtual bool closeYourself();
- virtual bool searchView();
- virtual bool log();
+ bool searchView() Q_DECL_OVERRIDE;
+ bool log() Q_DECL_OVERRIDE;
using ChatWindow::appendRaw;
virtual void appendRaw(MessageDirection dir, const QByteArray& message);
public Q_SLOTS:
void morphNotification();
protected:
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
};
#endif /* RAWLOG_H */
diff --git a/src/viewer/searchbar.h b/src/viewer/searchbar.h
--- a/src/viewer/searchbar.h
+++ b/src/viewer/searchbar.h
@@ -38,11 +38,11 @@
bool fromCursor() const;
- bool eventFilter(QObject* object, QEvent* e);
+ bool eventFilter(QObject* object, QEvent* e) Q_DECL_OVERRIDE;
protected:
- virtual void showEvent(QShowEvent* e);
- virtual void hideEvent(QHideEvent* e);
+ void showEvent(QShowEvent* e) Q_DECL_OVERRIDE;
+ void hideEvent(QHideEvent* e) Q_DECL_OVERRIDE;
bool focusedChild();
private Q_SLOTS:
diff --git a/src/viewer/statuspanel.h b/src/viewer/statuspanel.h
--- a/src/viewer/statuspanel.h
+++ b/src/viewer/statuspanel.h
@@ -30,51 +30,51 @@
explicit StatusPanel(QWidget* parent);
~StatusPanel();
- virtual void cycle();
+ void cycle() Q_DECL_OVERRIDE;
- virtual void setName(const QString& newName);
+ void setName(const QString& newName) Q_DECL_OVERRIDE;
- virtual bool closeYourself(bool askForConfirmation=true);
- virtual bool canBeFrontView();
- virtual bool searchView();
+ bool closeYourself(bool askForConfirmation=true) Q_DECL_OVERRIDE;
+ bool canBeFrontView() Q_DECL_OVERRIDE;
+ bool searchView() Q_DECL_OVERRIDE;
- virtual void setChannelEncoding(const QString& encoding);
- virtual QString getChannelEncoding();
- virtual QString getChannelEncodingDefaultDesc();
- virtual void emitUpdateInfo();
+ void setChannelEncoding(const QString& encoding) Q_DECL_OVERRIDE;
+ QString getChannelEncoding() Q_DECL_OVERRIDE;
+ QString getChannelEncodingDefaultDesc() Q_DECL_OVERRIDE;
+ void emitUpdateInfo() Q_DECL_OVERRIDE;
- virtual void setServer(Server* newServer);
+ void setServer(Server* newServer) Q_DECL_OVERRIDE;
- virtual void setNotificationsEnabled(bool enable);
+ void setNotificationsEnabled(bool enable) Q_DECL_OVERRIDE;
Q_SIGNALS:
void sendFile();
public Q_SLOTS:
void setNickname(const QString& newNickname);
- virtual void indicateAway(bool show);
+ void indicateAway(bool show) Q_DECL_OVERRIDE;
void updateAppearance();
void updateName();
protected Q_SLOTS:
void sendFileMenu();
void statusTextEntered();
- void sendText(const QString& line);
+ void sendText(const QString& line) Q_DECL_OVERRIDE;
// connected to IRCInput::textPasted() - used for large/multiline pastes
void textPasted(const QString& text);
void changeNickname(const QString& newNickname);
void nicknameComboboxChanged();
//Used to disable functions when not connected
- virtual void serverOnline(bool online);
+ void serverOnline(bool online) Q_DECL_OVERRIDE;
protected:
/** Called from ChatWindow adjustFocus */
- virtual void childAdjustFocus();
+ void childAdjustFocus() Q_DECL_OVERRIDE;
bool awayChanged;
bool awayState;
- void showEvent(QShowEvent* event);
+ void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
KComboBox* nicknameCombobox;
AwayLabel* awayLabel;
diff --git a/src/viewer/topicedit.h b/src/viewer/topicedit.h
--- a/src/viewer/topicedit.h
+++ b/src/viewer/topicedit.h
@@ -47,13 +47,13 @@
int maximumLength() const;
void setMaximumLength(int length);
- QSize minimumSizeHint() const;
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE;
- bool eventFilter(QObject* watched, QEvent* event);
+ bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE;
protected:
- void moveEvent(QMoveEvent* event);
+ void moveEvent(QMoveEvent* event) Q_DECL_OVERRIDE;
private Q_SLOTS:
diff --git a/src/viewer/topichistoryview.h b/src/viewer/topichistoryview.h
--- a/src/viewer/topichistoryview.h
+++ b/src/viewer/topichistoryview.h
@@ -45,13 +45,13 @@
explicit TopicHistorySortfilterProxyModel(QObject* parent = 0);
~TopicHistorySortfilterProxyModel();
- QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- void setSourceModel(QAbstractItemModel* model);
+ void setSourceModel(QAbstractItemModel* model) Q_DECL_OVERRIDE;
protected:
- bool filterAcceptsColumn ( int source_column, const QModelIndex & source_parent ) const;
+ bool filterAcceptsColumn ( int source_column, const QModelIndex & source_parent ) const Q_DECL_OVERRIDE;
private Q_SLOTS:
@@ -81,16 +81,16 @@
explicit TopicHistoryItemDelegate(QAbstractItemView* itemView, QObject* parent = 0);
~TopicHistoryItemDelegate();
- void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
- QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const;
+ void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_OVERRIDE;
+ QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_OVERRIDE;
- bool eventFilter(QObject* watched, QEvent* event);
+ bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE;
protected:
- QList createItemWidgets (const QModelIndex& index) const;
+ QList createItemWidgets (const QModelIndex& index) const Q_DECL_OVERRIDE;
void updateItemWidgets(const QList widgets, const QStyleOptionViewItem& option,
- const QPersistentModelIndex& index) const;
+ const QPersistentModelIndex& index) const Q_DECL_OVERRIDE;
private:
@@ -112,17 +112,17 @@
bool textSelectable() const;
void setTextSelectable(bool selectable);
- void setModel(QAbstractItemModel* model);
+ void setModel(QAbstractItemModel* model) Q_DECL_OVERRIDE;
Q_SIGNALS:
void textSelectableChanged(bool selectable);
protected:
- void resizeEvent(QResizeEvent* event);
- void contextMenuEvent (QContextMenuEvent* event);
- void updateGeometries();
+ void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
+ void contextMenuEvent (QContextMenuEvent* event) Q_DECL_OVERRIDE;
+ void updateGeometries() Q_DECL_OVERRIDE;
private Q_SLOTS:
diff --git a/src/viewer/topiclabel.h b/src/viewer/topiclabel.h
--- a/src/viewer/topiclabel.h
+++ b/src/viewer/topiclabel.h
@@ -30,8 +30,8 @@
explicit TopicLabel(QWidget *parent = 0, const char *name = 0);
~TopicLabel();
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE;
+ QSize sizeHint() const Q_DECL_OVERRIDE;
void setServer(Server* server);
void setChannelName(const QString& channel);
@@ -49,12 +49,12 @@
void updateSqueezedText();
QString rPixelSqueeze(const QString& text, int maxPixels);
int textWidth(const QString& text);
- virtual void leaveEvent (QEvent*);
- virtual void contextMenuEvent(QContextMenuEvent* ev);
- virtual void resizeEvent(QResizeEvent*);
- virtual void mouseReleaseEvent(QMouseEvent* ev);
- virtual void mousePressEvent(QMouseEvent* ev);
- virtual void mouseMoveEvent(QMouseEvent* ev);
+ void leaveEvent (QEvent*) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent* ev) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(QMouseEvent* ev) Q_DECL_OVERRIDE;
+ void mousePressEvent(QMouseEvent* ev) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent* ev) Q_DECL_OVERRIDE;
protected Q_SLOTS:
void highlightedSlot(const QString&);
diff --git a/src/viewer/viewcontainer.h b/src/viewer/viewcontainer.h
--- a/src/viewer/viewcontainer.h
+++ b/src/viewer/viewcontainer.h
@@ -70,8 +70,8 @@
void tabBarMiddleClicked(int index);
protected:
- virtual void contextMenuEvent(QContextMenuEvent* event);
- virtual void mouseReleaseEvent(QMouseEvent* event);
+ void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
};
class ViewContainer : public QAbstractItemModel
@@ -97,24 +97,24 @@
void prepareShutdown();
- int rowCount(const QModelIndex & parent = QModelIndex()) const;
- int columnCount(const QModelIndex& parent = QModelIndex()) const;
+ int rowCount(const QModelIndex & parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
- QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const;
+ QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex indexForView(ChatWindow* view) const;
- QModelIndex parent(const QModelIndex& index) const;
+ QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- Qt::DropActions supportedDragActions() const;
- Qt::DropActions supportedDropActions() const;
- Qt::ItemFlags flags(const QModelIndex &index) const;
- QStringList mimeTypes() const;
- QMimeData* mimeData(const QModelIndexList &indexes) const;
- bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const;
- bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
+ Qt::DropActions supportedDragActions() const Q_DECL_OVERRIDE;
+ Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
+ Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
+ QStringList mimeTypes() const Q_DECL_OVERRIDE;
+ QMimeData* mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE;
+ bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE;
+ bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
- bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+ bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
QString currentViewTitle();
QString currentViewURL(bool passNetwork = true);
diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
--- a/src/viewer/viewcontainer.cpp
+++ b/src/viewer/viewcontainer.cpp
@@ -1429,6 +1429,7 @@
connect(view, SIGNAL(setStatusBarTempText(QString)), this, SIGNAL(setStatusBarTempText(QString)));
connect(view, SIGNAL(clearStatusBarTempText()), this, SIGNAL(clearStatusBarTempText()));
connect(view, SIGNAL(closing(ChatWindow*)), this, SLOT(cleanupAfterClose(ChatWindow*)));
+ connect(view, SIGNAL(showView(ChatWindow*)), this, SLOT(showView(ChatWindow*)));
switch (view->getType())
{
diff --git a/src/viewer/viewspringloader.h b/src/viewer/viewspringloader.h
--- a/src/viewer/viewspringloader.h
+++ b/src/viewer/viewspringloader.h
@@ -36,7 +36,7 @@
void addWidget(QWidget* widget);
- bool eventFilter(QObject* watched, QEvent* event);
+ bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE;
private Q_SLOTS:
diff --git a/src/viewer/viewtree.h b/src/viewer/viewtree.h
--- a/src/viewer/viewtree.h
+++ b/src/viewer/viewtree.h
@@ -29,10 +29,10 @@
explicit ViewTreeDelegate(QObject *parent = 0);
~ViewTreeDelegate();
- QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const;
+ QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_OVERRIDE;
QSize preferredSizeHint(const QModelIndex& index) const;
- void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+ void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_OVERRIDE;
private:
ViewTree* m_view;
@@ -46,7 +46,7 @@
explicit ViewTree(QWidget *parent);
~ViewTree();
- virtual void setModel(QAbstractItemModel *model);
+ void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
bool dropIndicatorOnItem() const;
@@ -61,21 +61,21 @@
void showViewContextMenu(QWidget* widget, const QPoint& point) const;
protected:
- bool event(QEvent* event);
- void paintEvent(QPaintEvent* event);
- void drawRow(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
- void resizeEvent(QResizeEvent* event);
- void mousePressEvent(QMouseEvent* event);
- void mouseReleaseEvent(QMouseEvent* event);
- void mouseMoveEvent(QMouseEvent *event);
- void dragEnterEvent(QDragEnterEvent *event);
- void dragMoveEvent(QDragMoveEvent *event);
- void contextMenuEvent(QContextMenuEvent* event);
- void wheelEvent(QWheelEvent* event);
- void keyPressEvent(QKeyEvent* event);
+ bool event(QEvent* event) Q_DECL_OVERRIDE;
+ void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE;
+ void drawRow(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
+ void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
+ void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
+ void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
private Q_SLOTS:
- void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
+ void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected) Q_DECL_OVERRIDE;
private:
QPointer m_pressedView;