mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
Rename KMessageWidget files to match our coding style
This commit is contained in:
parent
41d5111684
commit
94f8650ca4
@ -86,7 +86,7 @@ set(keepassx_SOURCES
|
||||
gui/FileDialog.cpp
|
||||
gui/IconModels.cpp
|
||||
gui/KeePass1OpenWidget.cpp
|
||||
gui/kmessagewidget.cpp
|
||||
gui/KMessageWidget.cpp
|
||||
gui/LineEdit.cpp
|
||||
gui/MainWindow.cpp
|
||||
gui/MessageBox.cpp
|
||||
|
@ -158,12 +158,11 @@ void EditWidgetIcons::fetchFavicon(QUrl url)
|
||||
|
||||
void EditWidgetIcons::fetchFaviconFromGoogle(QString domain)
|
||||
{
|
||||
if (m_fallbackToGoogle) {
|
||||
if (m_fallbackToGoogle) {
|
||||
abortFaviconDownload();
|
||||
m_fallbackToGoogle = false;
|
||||
fetchFavicon(QUrl("http://www.google.com/s2/favicons?domain=" + domain));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
abortFaviconDownload();
|
||||
MessageBox::warning(this, tr("Error"), tr("Unable to fetch favicon."));
|
||||
}
|
||||
|
@ -18,7 +18,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301 USA
|
||||
*/
|
||||
#include "kmessagewidget.h"
|
||||
#include "KMessageWidget.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QEvent>
|
||||
@ -477,4 +477,4 @@ void KMessageWidget::setIcon(const QIcon &icon)
|
||||
}
|
||||
}
|
||||
|
||||
#include "moc_kmessagewidget.cpp"
|
||||
#include "moc_KMessageWidget.cpp"
|
@ -802,9 +802,7 @@ void MainWindow::displayGlobalMessage(const QString& text, MessageWidget::Messag
|
||||
|
||||
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()
|
||||
|
@ -18,7 +18,7 @@
|
||||
#ifndef MESSAGEWIDGET_H
|
||||
#define MESSAGEWIDGET_H
|
||||
|
||||
#include "gui/kmessagewidget.h"
|
||||
#include "gui/KMessageWidget.h"
|
||||
|
||||
class MessageWidget : public KMessageWidget
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user