Skip to content

Commit 755b61a

Browse files
1 parent cc5b821 commit 755b61a

6 files changed

Lines changed: 2 additions & 356 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,8 @@ elseif(UNIX) # assume xdg
243243
)
244244
list(APPEND LIB_SRC
245245
src/platform/unix/signalhandler.cpp
246-
src/platform/xdg/iconlookup.cpp
247-
src/platform/xdg/iconlookup.h
248246
src/platform/xdg/platform.cpp
249247
src/platform/xdg/desktopentryparser.cpp
250-
src/platform/xdg/themefileparser.cpp
251-
src/platform/xdg/themefileparser.h
252248
)
253249
endif()
254250

src/icon/themeicon.cpp

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
// SPDX-FileCopyrightText: 2022-2025 Manuel Schneider
1+
// SPDX-FileCopyrightText: 2022-2026 Manuel Schneider
22

33
#include "themeicon.h"
4-
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
5-
#include "iconlookup.h"
6-
#endif
74
using namespace Qt::StringLiterals;
85
using namespace albert;
96
using namespace std;
107

11-
128
ThemeIcon::ThemeIcon(const QString &name)
13-
: QIconIcon(
14-
// https://bugreports.qt.io/browse/QTBUG-135159
15-
// https://codereview.qt-project.org/c/qt/qtbase/+/634907
16-
#if QT_VERSION > 0x060800
17-
QIcon::fromTheme(name)
18-
#else
19-
QIcon(XDG::IconLookup::iconPath(name))
20-
#endif
21-
)
9+
: QIconIcon(QIcon::fromTheme(name))
2210
, name_(name)
2311
{}
2412

@@ -30,4 +18,3 @@ QString ThemeIcon::scheme() { return u"xdg"_s; }
3018

3119
unique_ptr<ThemeIcon> ThemeIcon::fromUrl(const QString &url)
3220
{ return make_unique<ThemeIcon>(url.mid(scheme().size() + 1 )); }
33-

src/platform/xdg/iconlookup.cpp

Lines changed: 0 additions & 173 deletions
This file was deleted.

src/platform/xdg/iconlookup.h

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/platform/xdg/themefileparser.cpp

Lines changed: 0 additions & 94 deletions
This file was deleted.

src/platform/xdg/themefileparser.h

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)