Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 16:29:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename KMessageWidget files to match our coding style

Browse Source
This commit is contained in:
Janek Bevendorff 2017-02-10 02:11:43 +01:00
parent 41d5111684
commit 94f8650ca4
No known key found for this signature in database
GPG Key ID: CFEC2F6850BFFA53
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -86,7 +86,7 @@ set(keepassx_SOURCES
gui/FileDialog.cpp gui/FileDialog.cpp
gui/IconModels.cpp gui/IconModels.cpp
gui/KeePass1OpenWidget.cpp gui/KeePass1OpenWidget.cpp
gui/kmessagewidget.cpp gui/KMessageWidget.cpp
gui/LineEdit.cpp gui/LineEdit.cpp
gui/MainWindow.cpp gui/MainWindow.cpp
gui/MessageBox.cpp gui/MessageBox.cpp

5
src/gui/EditWidgetIcons.cpp
View File

@ -158,12 +158,11 @@ void EditWidgetIcons::fetchFavicon(QUrl url)
void EditWidgetIcons::fetchFaviconFromGoogle(QString domain) void EditWidgetIcons::fetchFaviconFromGoogle(QString domain)
{ {
if (m_fallbackToGoogle) { if (m_fallbackToGoogle) {
abortFaviconDownload(); abortFaviconDownload();
m_fallbackToGoogle = false; m_fallbackToGoogle = false;
fetchFavicon(QUrl("http://www.google.com/s2/favicons?domain=" + domain)); fetchFavicon(QUrl("http://www.google.com/s2/favicons?domain=" + domain));
} } else {
else {
abortFaviconDownload(); abortFaviconDownload();
MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon.")); MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
} }

4
src/gui/kmessagewidget.cpp → src/gui/KMessageWidget.cpp
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA * 02110-1301 USA
*/ */
#include "kmessagewidget.h" #include "KMessageWidget.h"
#include <QAction> #include <QAction>
#include <QEvent> #include <QEvent>
@ -477,4 +477,4 @@ void KMessageWidget::setIcon(const QIcon &icon)
} }
} }
#include "moc_kmessagewidget.cpp" #include "moc_KMessageWidget.cpp"

0
src/gui/kmessagewidget.h → src/gui/KMessageWidget.h
View File

4
src/gui/MainWindow.cpp
View File

@ -802,9 +802,7 @@ void MainWindow::displayGlobalMessage(const QString& text, MessageWidget::Messag
void MainWindow::displayTabMessage(const QString& text, MessageWidget::MessageType type) void MainWindow::displayTabMessage(const QString& text, MessageWidget::MessageType type)
{ {
//if (m_ui->stackedWidget->currentIndex() == 0) { m_ui->tabWidget->currentDatabaseWidget()->showMessage(text, type);
m_ui->tabWidget->currentDatabaseWidget()->showMessage(text, type);
//}
} }
void MainWindow::hideGlobalMessage() void MainWindow::hideGlobalMessage()

2
src/gui/MessageWidget.h
View File

@ -18,7 +18,7 @@
#ifndef MESSAGEWIDGET_H #ifndef MESSAGEWIDGET_H
#define MESSAGEWIDGET_H #define MESSAGEWIDGET_H
#include "gui/kmessagewidget.h" #include "gui/KMessageWidget.h"
class MessageWidget : public KMessageWidget class MessageWidget : public KMessageWidget
{ {