History

replaced Application::resourcesPath() with PathUtils::resourcesPath()

ZappoMan committed 11 years ago

Commit bfcc78c1 parent 753dc0729 files · +194 −124Browse files

Showing the changes to interface/src/ui/AddressBarDialog.cpp (1 of 29 files). Show all

Unified · Split

interface/src/ui/AddressBarDialog.cpp+6−4
@@ -9,6 +9,8 @@ · 8 unmodified lines
99 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
1010 //
1111
12+#include <PathUtils.h>
13+
1214 #include "AddressBarDialog.h"
1315 #include "AddressManager.h"
1416 #include "Application.h"
@@ -82,7 +84,7 @@ void AddressBarDialog::setupUI() { · 67 unmodified lines
8284 _goButton->setSizePolicy(sizePolicy);
8385 _goButton->setMinimumSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
8486 _goButton->setMaximumSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
85− _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));
87+ _goButton->setIcon(QIcon(PathUtils::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));
8688 _goButton->setIconSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
8789 _goButton->setDefault(true);
8890 _goButton->setFlat(true);
@@ -99,7 +101,7 @@ void AddressBarDialog::setupUI() { · 10 unmodified lines
99101 _closeButton->setSizePolicy(sizePolicy);
100102 _closeButton->setMinimumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));
101103 _closeButton->setMaximumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));
102− QIcon icon(Application::resourcesPath() + CLOSE_BUTTON_ICON);
104+ QIcon icon(PathUtils::resourcesPath() + CLOSE_BUTTON_ICON);
103105 _closeButton->setIcon(icon);
104106 _closeButton->setIconSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));
105107 _closeButton->setFlat(true);
@@ -112,7 +114,7 @@ void AddressBarDialog::setupUI() { · 6 unmodified lines
112114 }
113115
114116 void AddressBarDialog::showEvent(QShowEvent* event) {
115− _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));
117+ _goButton->setIcon(QIcon(PathUtils::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));
116118 _addressLineEdit->setText(QString());
117119 _addressLineEdit->setFocus();
118120 FramelessDialog::showEvent(event);
@@ -120,7 +122,7 @@ void AddressBarDialog::showEvent(QShowEvent* event) { · 1 unmodified line
120122
121123 void AddressBarDialog::accept() {
122124 if (!_addressLineEdit->text().isEmpty()) {
123− _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ACTIVE_ICON));
125+ _goButton->setIcon(QIcon(PathUtils::resourcesPath() + ADDRESSBAR_GO_BUTTON_ACTIVE_ICON));
124126 AddressManager& addressManager = AddressManager::getInstance();
125127 connect(&addressManager, &AddressManager::lookupResultsFinished, this, &QDialog::hide);
126128 addressManager.handleLookupString(_addressLineEdit->text());