alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
bdb7251250
plasma-framework/private
History
David Faure bdb7251250 Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 
Conflicts:
	CMakeLists.txt [version]
	README [version]
	cmake/modules/CMakeLists.txt
	cmake/modules/FindKDE4Internal.cmake
	cmake/modules/FindNepomuk.cmake [git replaying an old conflict!]
	cmake/modules/KDE4Macros.cmake [automoc4 stuff, reverted]
	interfaces/ktexteditor/* [moved out]
	kdecore/services/kmimetype.cpp [hand-merged into kio/global.cpp]
	kdeui/util/kkeyserver.h
	kdeui/widgets/ktextedit.cpp
	kdewebkit/kwebwallet.cpp
	khtml/misc/enum.h [git got confused, me thinks]
	kio/kio/accessmanager.cpp
	kio/kio/hostinfo.cpp
	kio/kio/kprotocolmanager.cpp
	kio/kio/kprotocolmanager.h
	kioslave/http/http.cpp
	kioslave/http/http.h
	kioslave/http/tests/CMakeLists.txt
	kioslave/http/tests/httpheaderdispositiontest.cpp
	nepomuk/core/* [moved out]
	plasma/CMakeLists.txt
	plasma/applet.cpp
	plasma/applet.h
	plasma/dialog.cpp
	plasma/packagestructure.cpp
	plasma/popupapplet.cpp
	plasma/private/applethandle.cpp
	plasma/private/packages.cpp
	plasma/private/tooltip.cpp
	plasma/tooltipmanager.cpp
	plasma/widgets/videowidget.h
	staging/ki18n/src/klocalizedstring.cpp
	staging/kservice/autotests/kservicetest.cpp
	staging/kwidgets/src/utils/kglobalsettings.cpp
	tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp
	tier1/solid/src/solid/backends/upower/upoweracadapter.cpp
	tier1/solid/src/solid/backends/upower/upowerbattery.cpp
2012-12-01 00:57:38 +01:00
..
declarative Convert to makedefine01 2012-08-24 03:16:04 +02:00
effects massive step towards QGraphicsView being separated from libplasma 2011-11-17 14:43:37 +01:00
qtjolie-branch Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 2012-10-19 15:10:38 +02:00
abstractrunner_p.h make DataEngineConsumer public API 2012-09-24 15:52:16 +02:00
accessmanager_p.h --PackageMetadata; 2011-05-31 01:00:35 +02:00
actionwidgetinterface_p.h the dptr will be deleted before ~QObject is run, so first disconnect 2011-01-11 02:55:55 +00:00
applet_p.cpp ki18n framework split out of kdecore. 2012-11-18 20:26:13 +01:00
applet_p.h remove geometry functions from Applet 2012-11-09 16:45:03 +01:00
associatedapplicationmanager_p.h KUrl::List -> QList<QUrl> everywhere. Make KDirNotify API take urls, to avoid conversions in the caller. 2012-07-15 23:56:29 +02:00
associatedapplicationmanager.cpp Fix compilation after kservice framework extraction 2012-09-18 18:23:40 +02:00
componentinstaller_p.h Add an API (currently private) for installing missing Plasma engines. 2011-08-03 10:21:39 +02:00
componentinstaller.cpp More K_GLOBAL_STATIC -> Q_GLOBAL_STATIC porting 2012-07-19 21:19:01 +02:00
configloader_p.h KUrl::List -> QList<QUrl> everywhere. Make KDirNotify API take urls, to avoid conversions in the caller. 2012-07-15 23:56:29 +02:00
containment_p.cpp remove wallpaper files 2012-11-21 15:30:50 +01:00
containment_p.h remove dependencies from WallPaper 2012-11-21 15:30:50 +01:00
containmentactions_p.h get rid of ContainmentActions::isInitialized() 2012-11-09 18:55:23 +01:00
containmentactionspluginsconfig_p.h make a class to hold a map of default containmentactions plugins 2009-10-05 20:50:57 +00:00
corona_p.h add missing corona_p 2012-11-08 18:35:22 +01:00
datacontainer_p.cpp Fix compilation with the new cmake automoc stuff. 2012-02-08 23:34:07 +01:00
datacontainer_p.h Merge remote-tracking branch 'origin/KDE/4.7' into frameworks 2011-10-30 10:44:59 +01:00
dataengine_p.h get rid of the source limiting; wasn't used, only overhead 2011-11-30 12:58:20 +01:00
dataengineconsumer_p.h make DataEngineManager private; use DataEngineConsumer instead 2012-09-24 16:09:16 +02:00
dataenginemanager_p.h make DataEngineManager private; use DataEngineConsumer instead 2012-09-24 16:09:16 +02:00
dataenginemanager.cpp make DataEngineManager private; use DataEngineConsumer instead 2012-09-24 16:09:16 +02:00
dataengineservice_p.h QHash replaces QMap as the sorting of QMap is pure overhead 2011-05-26 19:01:44 +02:00
dataengineservice.cpp Remove moc includes that can be omitted. 2012-01-31 22:44:36 +01:00
dialog_p.h allow controlling the resize a bit more 2011-12-16 14:57:20 +01:00
dialogshadows_p.h less debug, element prefix in ctor 2012-11-16 16:08:46 +01:00
dialogshadows.cpp less debug, element prefix in ctor 2012-11-16 16:08:46 +01:00
effectwatcher_p.h Port EffectWatcher to QAbstractNativeEventFilter 2012-11-23 23:38:38 +01:00
effectwatcher.cpp Port EffectWatcher to QAbstractNativeEventFilter 2012-11-23 23:38:38 +01:00
framesvg_p.h include missing initializations 2012-10-10 19:07:06 +02:00
getsource_p.h QHash replaces QMap as the sorting of QMap is pure overhead 2011-05-26 19:01:44 +02:00
getsource.cpp Remove moc includes that can be omitted. 2012-01-31 22:44:36 +01:00
joliemessagehelper_p.h relicense to LGPL v2 2010-01-18 18:24:57 +00:00
package_p.h fix resolution of paths w/ only a packageRoot+name 2011-08-31 12:53:09 +02:00
packages_p.h remove dependencies from WallPaper 2012-11-21 15:30:50 +01:00
packages.cpp Delete download dialog when it is closed 2012-11-23 12:53:33 +01:00
plasmoidservice_p.h make DataEngineConsumer public API 2012-09-24 15:52:16 +02:00
plasmoidservice.cpp make DataEngineConsumer public API 2012-09-24 15:52:16 +02:00
publish.ui Checkbox labels do not need a full stop according to KDE HIG 2009-11-15 13:41:00 +00:00
remotedataengine_p.h Some KUrl-QUrl porting. 2012-03-11 10:34:38 +01:00
remotedataengine.cpp Some KUrl-QUrl porting. 2012-03-11 10:34:38 +01:00
remoteservice_p.h Some KUrl-QUrl porting. 2012-03-11 10:34:38 +01:00
remoteservice.cpp Some KUrl-QUrl porting. 2012-03-11 10:34:38 +01:00
remoteservicejob_p.h QHash replaces QMap as the sorting of QMap is pure overhead 2011-05-26 19:01:44 +02:00
remoteservicejob.cpp avoid compiling in debug strings when compiled without debug 2011-07-29 15:46:52 +02:00
runnerjobs_p.h when setAllowedRunners is called, call loadRunners, which now also allows for being called while a search is in progress 2011-11-22 12:17:06 +01:00
runnerjobs.cpp Remove moc includes that can be omitted. 2012-01-31 22:44:36 +01:00
service_p.h migrate some other events from qgraphicsevents 2012-11-08 18:34:17 +01:00
servicejob_p.h QHash replaces QMap as the sorting of QMap is pure overhead 2011-05-26 19:01:44 +02:00
serviceprovider_p.h Add QByteArray and QString wrappers around + as needed. 2011-05-11 21:46:35 -06:00
serviceprovider.cpp Convert to makedefine01 2012-08-24 03:16:04 +02:00
sharedtimer_p.h ok, this time JUST the plasma dir ;) 2008-11-03 23:08:39 +00:00
storage_p.h Merge remote branch 'origin/KDE/4.7' into origin-frameworks 2011-09-28 17:44:59 +02:00
storage.cpp Ran convert-kstandarddirs.pl and fixed compilation (includes) in a few places 2012-06-12 15:02:33 +02:00
storagethread_p.h use a hash instead of a map: the sorting was irrelevant and the API that uses this was ported to hashes as well 2011-09-19 11:27:54 +02:00
storagethread.cpp More K_GLOBAL_STATIC -> Q_GLOBAL_STATIC porting 2012-07-19 21:19:01 +02:00
svg_p.h Correction of spelling errors for c++ files 2012-08-12 10:56:17 -04:00
windowpreview_p.h add a new member to the tooltip data that decides if the window highlight effect is to be enabled by default or not 2009-12-24 14:54:48 +00:00
windowpreview.cpp More removals of Q_WS_* in favor of Q_OS_* or HAVE_X11 2012-08-03 11:45:20 +02:00
windowshadows_p.h shadows on dialogs 2011-06-09 12:46:25 +02:00
windowshadows.cpp plasma: QPixmap platform integration has changed in Qt5, disable it for now. 2012-10-23 14:10:01 +02:00