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

various cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-06-26 10:32:24 +00:00
parent f87dd350b0
commit 19b804b850
11 changed files with 5 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -20,6 +20,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/staticlib")
include(CheckIncludeFile)
include(CheckTypeSize)
include(FeatureSummary)
include(KatieMacros)
include(KatieBuildMacros)
@ -210,6 +211,9 @@ else()
add_definitions(-DTIME_WITH_SYS_TIME=0)
endif()
# used in qconfig.h
check_type_size(size_t QT_POINTER_SIZE)
configure_file(
${CMAKE_SOURCE_DIR}/src/core/global/qconfig.h.cmake
${CMAKE_BINARY_DIR}/include/QtCore/qconfig.h

3
mkspecs/tests/tests.cmake
View file

@ -78,5 +78,4 @@ endmacro()
katie_misc_test(stl STL)
include(CheckTypeSize)
check_type_size(size_t QT_POINTER_SIZE)
# TODO: check if data relocations should be disabled before any target additions and define Q_NO_DATA_RELOCATION

9
src/gui/dialogs/qmessagebox.cpp
View file

@ -1736,15 +1736,6 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
#endif
}
/*!
\internal
*/
QSize QMessageBox::sizeHint() const
{
// ### Qt 5: remove
return QDialog::sizeHint();
}
/////////////////////////////////////////////////////////////////////////////////////////
// Source and binary compatibility routines for 4.0 and 4.1

2
src/gui/dialogs/qmessagebox.h
View file

@ -198,8 +198,6 @@ public:
static void about(QWidget *parent, const QString &title, const QString &text);
static void aboutQt(QWidget *parent, const QString &title = QString());
QSize sizeHint() const;
QString informativeText() const;
void setInformativeText(const QString &text);

20
src/gui/itemviews/qtreewidget.cpp
View file

@ -2887,26 +2887,6 @@ void QTreeWidget::sortItems(int column, Qt::SortOrder order)
d->model->sort(column, order);
}
/*!
\internal
### Qt 5: remove
*/
void QTreeWidget::setSortingEnabled(bool enable)
{
QTreeView::setSortingEnabled(enable);
}
/*!
\internal
### Qt 5: remove
*/
bool QTreeWidget::isSortingEnabled() const
{
return QTreeView::isSortingEnabled();
}
/*!
Starts editing the \a item in the given \a column if it is editable.
*/

2
src/gui/itemviews/qtreewidget.h
View file

@ -299,8 +299,6 @@ public:
int sortColumn() const;
void sortItems(int column, Qt::SortOrder order);
void setSortingEnabled(bool enable);
bool isSortingEnabled() const;
void editItem(QTreeWidgetItem *item, int column = 0);
void openPersistentEditor(QTreeWidgetItem *item, int column = 0);

31
src/gui/kernel/qevent.cpp
View file

@ -905,15 +905,6 @@ QFocusEvent::~QFocusEvent()
{
}
// ### Qt 5: remove
/*!
\internal
*/
Qt::FocusReason QFocusEvent::reason()
{
return m_reason;
}
/*!
Returns the reason for this focus event.
*/
@ -3389,13 +3380,6 @@ QClipboardEvent::~QClipboardEvent()
Returns the key sequence that triggered the event.
*/
// ### Qt 5: remove
/*!
\fn const QKeySequence &QShortcutEvent::key()
\internal
*/
/*!
\fn int QShortcutEvent::shortcutId() const
@ -3405,14 +3389,6 @@ QClipboardEvent::~QClipboardEvent()
\sa QShortcut::id()
*/
// ### Qt 5: remove
/*!
\fn int QShortcutEvent::shortcutId()
\overload
\internal
*/
/*!
\fn bool QShortcutEvent::isAmbiguous() const
@ -3422,13 +3398,6 @@ QClipboardEvent::~QClipboardEvent()
\sa QShortcut::activatedAmbiguously()
*/
// ### Qt 5: remove
/*!
\fn bool QShortcutEvent::isAmbiguous()
\internal
*/
/*!
\class QWindowStateChangeEvent
\ingroup events

4
src/gui/kernel/qevent.h
View file

@ -245,7 +245,6 @@ public:
inline bool gotFocus() const { return type() == FocusIn; }
inline bool lostFocus() const { return type() == FocusOut; }
Qt::FocusReason reason();
Qt::FocusReason reason() const;
private:
@ -609,11 +608,8 @@ public:
QShortcutEvent(const QKeySequence &key, int id, bool ambiguous = false);
~QShortcutEvent();
inline const QKeySequence &key() { return sequence; }
inline const QKeySequence &key() const { return sequence; }
inline int shortcutId() { return sid; }
inline int shortcutId() const { return sid; }
inline bool isAmbiguous() { return ambig; }
inline bool isAmbiguous() const { return ambig; }
protected:
QKeySequence sequence;

1
src/help/qhelpengine.cpp
View file

@ -52,7 +52,6 @@
#include <QtCore/QLibrary>
#include <QtCore/QPluginLoader>
#include <QtGui/QApplication>
#include <QtSql/QSqlQuery>
QT_BEGIN_NAMESPACE

2
src/help/qhelpengine_p.h
View file

@ -60,8 +60,6 @@
QT_BEGIN_NAMESPACE
class QSqlQuery;
class QHelpEngineCore;
class QHelpDBReader;
class QHelpContentModel;

1
src/help/qhelpenginecore.cpp
View file

@ -51,7 +51,6 @@
#include <QtCore/QFileInfo>
#include <QtCore/QThread>
#include <QtGui/QApplication>
#include <QtSql/QSqlQuery>
QT_BEGIN_NAMESPACE