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 2016-03-06 15:59:05 +00:00
parent c9cbc904e1
commit 1159ece183
9 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/modules/FindKDE4Internal.cmake
View file

@ -235,10 +235,6 @@
# this is required by cmake >=2.6
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
# CMake 2.6, set compatibility behaviour to cmake 2.4
# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
# resets the policy settings, so we get a lot of warnings
# CMP0000: don't require cmake_minimum_version() directly in the top level
# CMakeLists.txt, FindKDE4Internal.cmake is good enough
cmake_policy(SET CMP0000 OLD)

2
cmake/modules/FindLibXslt.cmake
View file

@ -51,8 +51,6 @@ ELSE (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
FIND_PROGRAM(LIBXSLT_XSLTPROC_EXECUTABLE xsltproc)
# For compatibility with FindLibXslt.cmake from KDE 4.[01].x
SET(XSLTPROC_EXECUTABLE ${LIBXSLT_XSLTPROC_EXECUTABLE})
IF (LIBXSLT_FOUND)
IF (NOT LibXslt_FIND_QUIETLY)

4
dnssd/CreateKcfgFiles.cmake
View file

@ -1,8 +1,8 @@
if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
set(KDNSSD_SETTINGS_BASE_CLASS "KCoreConfigSkeleton")
else(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
else()
set(KDNSSD_SETTINGS_BASE_CLASS "KConfigSkeleton")
endif(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
endif()
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/settings.kcfgc
"ClassName=Configuration

2
kdeclarative/CMakeLists.txt
View file

@ -2,7 +2,7 @@ project(kdeclarative)
if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(KDECLARATIVE_NO_KIO TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
endif()
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/config-kdeclarative.h.cmake

2
kded/CMakeLists.txt
View file

@ -8,7 +8,7 @@ include_directories( ${KDE4_KIO_INCLUDES} )
if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(KBUILDSYCOCA_NO_KCRASH TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
endif()
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/config-kded.h.cmake

3
kioslave/http/http.cpp
View file

@ -3450,8 +3450,7 @@ endParsing:
// We need to reread the header if we got a '100 Continue' or '102 Processing'
// This may be a non keepalive connection so we handle this kind of loop internally
if ( cont )
{
if ( cont ) {
kDebug(7113) << "cont; returning to mark try_again";
goto try_again;
}

5
kjs/ExecState.h
View file

@ -232,9 +232,6 @@ namespace KJS {
// important property lookup functions, to avoid taking PIC branches in Mach-O binaries
const CommonIdentifiers& propertyNames() const { return *m_propertyNames; }
// Compatibility stuff:
ExecState* context() { return this; }
ExecState* callingContext() { return callingExecState(); }
protected:
ExecState(Interpreter* intp, ExecState* save);
~ExecState();
@ -276,8 +273,6 @@ namespace KJS {
CodeType m_codeType;
};
typedef ExecState Context; // Compatibility only
class GlobalExecState : public ExecState {
public:
GlobalExecState(Interpreter* intp, JSGlobalObject* global);

6
plasma/corona.cpp
View file

@ -448,14 +448,8 @@ QRegion Corona::availableScreenRegion(int id) const
return QRegion(screenGeometry(id));
}
QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s)
{
return popupPosition(item, s, Qt::AlignLeft);
}
QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::AlignmentFlag alignment)
{
// TODO: merge both methods (also these in Applet) into one (with optional alignment) when we can break compatibility
// TODO: add support for more flags in the future?
const QGraphicsItem *actualItem = item;

11
plasma/corona.h
View file

@ -194,15 +194,6 @@ public:
*/
virtual QRegion availableScreenRegion(int id) const;
/**
* Recommended position for a popup window like a menu or a tooltip
* given its size
* @param item the item that the popup should appear adjacent to (an applet, say)
* @param size size of the popup
* @returns reccomended position
*/
QPoint popupPosition(const QGraphicsItem *item, const QSize &size);
/**
* @since 4.4
* Recommended position for a popup window like a menu or a tooltip
@ -212,7 +203,7 @@ public:
* @param alignment alignment of the popup, valid flags are Qt::AlignLeft, Qt::AlignRight and Qt::AlignCenter
* @returns reccomended position
*/
QPoint popupPosition(const QGraphicsItem *item, const QSize &size, Qt::AlignmentFlag alignment);
QPoint popupPosition(const QGraphicsItem *item, const QSize &size, Qt::AlignmentFlag alignment = Qt::AlignLeft);
/**
* This method is useful in order to retrieve the list of available