Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-11-19 22:36:56 +02:00
parent 865ac9b08f
commit e515c1bf23
4 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kdeui/widgets/kmainwindow.h
View file

@ -50,9 +50,6 @@ class KToolBar;
inline const classname ## Private *k_func() const { return reinterpret_cast<classname ## Private *>(k_ptr); } \ inline const classname ## Private *k_func() const { return reinterpret_cast<classname ## Private *>(k_ptr); } \
friend class classname ## Private; friend class classname ## Private;
// This is mostly from KDE3. TODO KDE5: remove the constructor parameter.
#define KDE_DEFAULT_WINDOWFLAGS 0
/** /**
* @short %KDE top level main window * @short %KDE top level main window
* *
@ -147,7 +144,7 @@ public:
* for the composer windows "composer#". * for the composer windows "composer#".
* *
*/ */
explicit KMainWindow( QWidget* parent = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS ); explicit KMainWindow( QWidget* parent = 0, Qt::WindowFlags f = 0 );
/** /**
* \brief Destructor. * \brief Destructor.

4
kdeui/xmlgui/kxmlguiwindow.h
View file

@ -41,8 +41,6 @@ class KConfigGroup;
class KToolBar; class KToolBar;
class KXmlGuiWindowPrivate; class KXmlGuiWindowPrivate;
#define KDE_DEFAULT_WINDOWFLAGS 0
/** /**
* @short %KDE top level main window with predefined action layout * @short %KDE top level main window with predefined action layout
* *
@ -104,7 +102,7 @@ public:
* for the composer windows "composer#". * for the composer windows "composer#".
* *
*/ */
explicit KXmlGuiWindow( QWidget* parent = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS ); explicit KXmlGuiWindow( QWidget* parent = 0, Qt::WindowFlags f = 0 );
/** /**
* \brief Destructor. * \brief Destructor.

8
kio/bookmarks/kbookmark.cc
View file

@ -345,14 +345,6 @@ QString KBookmark::icon() const
QDomElement iconElement = cd(metaDataNode, "bookmark:icon", false).toElement(); QDomElement iconElement = cd(metaDataNode, "bookmark:icon", false).toElement();
QString icon = iconElement.attribute("name"); QString icon = iconElement.attribute("name");
// migration code
if (icon.isEmpty())
icon = element.attribute("icon");
if (icon == "www") // common icon for kde3 bookmarks
return "internet-web-browser";
// end migration code
if (icon == "bookmark_folder") { if (icon == "bookmark_folder") {
return "folder-bookmarks"; return "folder-bookmarks";
} }

2
kparts/mainwindow.h
View file

@ -50,7 +50,7 @@ class KPARTS_EXPORT MainWindow : public KXmlGuiWindow, virtual public PartBase
/** /**
* Constructor, same signature as KMainWindow. * Constructor, same signature as KMainWindow.
*/ */
explicit MainWindow( QWidget* parent = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS ); explicit MainWindow( QWidget* parent = 0, Qt::WindowFlags f = 0 );
/** /**
* Destructor. * Destructor.
*/ */