X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Ficon.h;h=b794cd69e13e1b1e5ee75f0249b8dc65a5e1741c;hb=b2169e5f4cbd3ce724c4808b62ddc2b8941219a5;hp=2c1d62eead8dfca60914aa648daf35d00f4cf943;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c;p=quassel.git diff --git a/src/uisupport/icon.h b/src/uisupport/icon.h index 2c1d62ee..b794cd69 100644 --- a/src/uisupport/icon.h +++ b/src/uisupport/icon.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #ifndef ICON_H_ @@ -30,26 +30,28 @@ * The overloaded ctor uses IconLoader to locate an icon with this basename in the current theme * or in Qt Resources. */ -class Icon : public QIcon { - - public: +class Icon : public QIcon +{ +public: Icon(); explicit Icon(const QString &iconName); - explicit Icon(const QIcon& copy); + explicit Icon(const QIcon ©); - Icon& operator=(const Icon &other); + Icon &operator=(const Icon &other); }; + #else /* HAVE_KDE */ #include -class Icon : public KIcon { - - public: +class Icon : public KIcon +{ +public: inline Icon() : KIcon() {}; inline explicit Icon(const QString &iconName) : KIcon(iconName) {}; - inline explicit Icon(const QIcon& copy) : KIcon(copy) {}; + inline explicit Icon(const QIcon ©) : KIcon(copy) {}; }; + #endif /* HAVE_KDE */ #endif