Commit Graph

7461 Commits

Author SHA1 Message Date
Aaron Seigo
18563be2fb code style fixes 2012-09-23 11:25:03 +02:00
Sebastian Kügler
885ca80083 API change: listWallpaperInfoForMimetype listWallpaperInfoForMimeType
(capital T instead of t, in line with mimeType everywhere else)
2012-09-23 01:13:16 +02:00
Luca Beltrame
2117212b1a Merge branch 'KDE/4.9' into KDE/4.10 2012-09-21 21:23:39 +02:00
Marco Martin
bff36e9d25 don't mess with widget maximum size
avoids some resize dance or widgets misteriously growing
2012-09-20 13:28:38 +02:00
Marco Martin
8db63c42a9 support maximum and preferred sizes as well 2012-09-20 11:49:17 +02:00
Marco Martin
4f67a643a9 don't try to draw frame parts with size < 0 2012-09-19 21:09:37 +02:00
David Faure
72c4428b03 Fix compilation after kservice framework extraction 2012-09-18 18:23:40 +02:00
David Faure
e23f57ef9e Port KGlobal::mainComponent() to KComponentData::mainComponent()
except in klibrary/kpluginloader, where I just removed the now-useless
argument.
2012-09-16 22:31:57 +02:00
David Faure
f128824f4b Port away from KGlobal::mainComponent().componentName() 2012-09-16 18:53:38 +02:00
David Faure
6620a16b73 Merge remote-tracking branch 'origin/KDE/4.10' into frameworks
Conflicts:
	kdeui/fonts/kfontchooser.cpp [same mess as in master]
	kdeui/jobs/kdialogjobuidelegate.cpp [moc]
	kjs/tests/ecmatest_broken_ch15 [rename/rename]
	kjs/tests/ecmatest_broken_ch15.2 [rename/rename]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcewatcher.cpp [gone]
	nepomuk/core/resourcewatcher.h [gone]
	tier1/kjs/autotests/ecmatest_broken_ch15 [rename/rename]
2012-09-16 11:44:07 +02:00
Montel Laurent
2b8e003229 Merge remote-tracking branch 'origin/KDE/4.9' into KDE/4.10 2012-09-08 11:58:57 +02:00
Marco Martin
e2b94040e6 intersect the clip rect when painting 2012-09-07 22:27:58 +02:00
David Faure
0e74ac0cd9 Remove unnecessary kapplication.h includes. 2012-09-04 21:16:49 +02:00
David Faure
6c932bca0f Remove unused kglobal.h includes, thx to tsdgeos' magic bash line
Replace a few more KGlobal::locale with KLocale::global
2012-09-04 20:52:25 +02:00
David Faure
3d0d287103 perl -pi -e 's/KGlobal::locale/KLocale::global/' ... 2012-09-03 23:09:27 +02:00
Nicolas Lécureuil
39b38d1632 Get rid of config.h
Convert to cmakedefine01
2012-08-25 03:00:36 +02:00
Kevin Funk
7328967f2c Plasma: Compile with ENABLE_REMOTE_WIDGETS on 2012-08-24 14:29:30 +02:00
Nicolas Lécureuil
d6902786bf Convert #ifdef to #if 2012-08-24 03:19:29 +02:00
Nicolas Lécureuil
d50d3a3162 Convert to makedefine01 2012-08-24 03:16:04 +02:00
Nicolas Lécureuil
97b99d3b06 Define HAVE_X11 in config-plasma.h 2012-08-24 02:45:39 +02:00
Nicolas Lécureuil
c87dad12e5 Use config-plasma.h instead of config.g 2012-08-24 02:44:08 +02:00
Kevin Ottens
c474486a59 Add missing config.h include 2012-08-23 22:10:24 +02:00
Nicolas Lécureuil
1e9c19aa5a Remove useless include 2012-08-23 04:15:32 +02:00
David Faure
96b24f9f93 Merge remote-tracking branch 'origin/KDE/4.10' into frameworks 2012-08-20 18:54:42 +02:00
David Faure
9b571ddec0 Add dummy file so that the "images" subdir exists in git.
This fixes the packagestructuretest plasma unittest. All green!
2012-08-19 10:39:57 +02:00
David Faure
986cf06b49 Fix expected result after port to QUrl. 2012-08-19 10:36:34 +02:00
David Faure
b68a8147b2 Update expected test result after port to QUrl 2012-08-18 22:47:41 +02:00
Nicolás Alvarez
d45a12adb7 Merge udisks2 Solid backend into 4.10.
This code and git history was extracted from the 'frameworks' branch.
2012-08-17 17:55:41 -03:00
David Faure
fa8d1046ef Merge remote-tracking branch 'origin/KDE/4.10' into frameworks
Conflicts:
	CMakeLists.txt [version number]
	cmake/modules/KDE4Macros.cmake [modifications to dead code]
	interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop [deleted]
	interfaces/ktexteditor/ktexteditorplugin.desktop [deleted]
	kparts/tests/partviewer.cpp [includes]
	nepomuk/core/nepomukmainmodel.cpp [deleted]
	nepomuk/core/resource.cpp [deleted]
	nepomuk/test/CMakeLists.txt [deleted]
	tier1/kcoreaddons/src/io/klockfile_unix.cpp [already fixed]
	tier1/solid/src/solid/backends/hal/halmanager.cpp [modifications to dead code, AFAICS]
2012-08-16 13:24:21 +02:00
Frédéric Sheedy
ddbf7df71b Correction of spelling errors for c++ files 2012-08-12 10:56:17 -04:00
Script Kiddy
631d858e6a SVN_SILENT made messages (.desktop file) 2012-08-06 09:28:55 +02:00
Albert Astals Cid
2679fe483e Remove unneeded kcolorutils.h includes
Found with
diff -ub  <( wcgrep -l "kcolorutils\.h" | sort ) <(wcgrep -l 'KColorUtils::' | sort ) | grep -v CMakeLists.txt | grep ^"-\.
2012-08-06 00:46:03 +02:00
Albert Astals Cid
3421644d01 Remove unneded kurlmimedata.h include
Found by
diff -ub  <( wcgrep -l "kurlmimedata\.h" | sort ) <(wcgrep -l 'KUrlMimeData::' | sort ) | grep -v CMakeLists.txt | grep ^"-\."
2012-08-06 00:38:25 +02:00
Albert Astals Cid
ac117b6c2d Remove unneded kglobal.h includes
Found with
diff -ub  <( wcgrep -l "kglobal\.h" | sort ) <(wcgrep -l 'KGlobal::\|K_GLOBAL\|KSharedConfigPtr' | sort ) | grep -v CMakeLists.txt | grep ^"-\."
2012-08-06 00:27:15 +02:00
Kevin Ottens
05e48339e6 Also get rid of the #if defined HAVE_X11 constructs
Forgot them earlier, they're now ported to just #if HAVE_X11 as well
2012-08-03 16:53:37 +02:00
Kevin Ottens
77b49e1a8a Use #if HAVE_X11 instead of #ifdef HAVE_X11 as advised by David 2012-08-03 13:00:02 +02:00
Kevin Ottens
6c29469338 Oops, missing a config.h include 2012-08-03 12:20:21 +02:00
Kevin Ottens
22f74fc0ca More removals of Q_WS_* in favor of Q_OS_* or HAVE_X11 2012-08-03 11:45:20 +02:00
Dominik Haumann
54433eaca3 KGlobalSettings::singleClick() -> style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)
KGlobalSettings::singleClick() is still used in kde3support.
- do we really need kde3support?
- should the singleClick be ported here as well?
2012-08-02 21:56:05 +02:00
Raphael Kubo da Costa
c0d3b534e2 Merge branch 'KDE/4.8' into KDE/4.9
Merged via `git merge --log --edit --no-ff --stat -s
recursive'. According to the diffstat, the only actual changes came
from the solid-hal commit below, as expected.

* KDE/4.8:
  HAL: Use the filtering code in HalDevice in devicesFromQuery().
  Fix mem leak (cherry picked from commit b70d6c3d5a021bc37b962c01fc57b6717e9f2868)
  Fix mem leak. Found during debug kmail (cherry picked from commit 0fddae9da44c7edb2140aeb95b4471e2521b1735)
  Allow derived classes to return invalid index in mapToSource.
  SVN_SILENT made messages (.desktop file)
2012-07-23 22:36:11 -03:00
David Faure
18d587a33d Merge branch 'frameworks' of git://anongit.kde.org/kdelibs into frameworks 2012-07-20 15:14:37 +02:00
David Faure
d930917d95 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
Conflicts:
	CMakeLists.txt
	kdecore/tests/kstandarddirstest.cpp
	kdecore/tests/kurltest.cpp
	kdeui/actions/kaction.cpp
	kdeui/tests/CMakeLists.txt
	kio/kio/krun.cpp
	nepomuk/core/nepomukmainmodel.cpp [gone]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcemanager.cpp [gone]
	nepomuk/core/resourcemanager_p.h [gone]
	staging/kde4support/autotests/kmimetypetest.cpp [splitted out]
	staging/kwidgets/src/utils/kglobalsettings.cpp
	tier1/itemmodels/src/kviewstateserializer.cpp
2012-07-20 15:10:26 +02:00
Albert Astals Cid
75ccb1b463 More K_GLOBAL_STATIC -> Q_GLOBAL_STATIC porting
Acked by dfaure
REVIEW: 105611
2012-07-19 21:19:01 +02:00
Script Kiddy
d3e78d9b8f SVN_SILENT made messages (.desktop file) 2012-07-19 15:53:10 +02:00
Script Kiddy
52fbecaf2c SVN_SILENT made messages (.desktop file) 2012-07-19 10:11:11 +02:00
David Faure
402baf422d Merge branch 'KDE/4.8' into KDE/4.9 2012-07-17 23:17:30 +02:00
Marco Martin
f65d8b2abb move all ContainmentPrivate impl in own file 2012-07-17 14:21:45 +02:00
Marco Martin
4a747bf164 appletprivate.cpp -> applet_p.cpp 2012-07-17 13:44:50 +02:00
Marco Martin
095a196120 move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
David Faure
68a7db068b KUrl::List -> QList<QUrl> everywhere. Make KDirNotify API take urls, to avoid conversions in the caller.
DBus, however, needs QList<QUrl> <-> QStringList conversions, which is why
both nepomuk and now KIO have methods for this... => submitted to Qt5's QUrl.
2012-07-15 23:56:29 +02:00