1 Index: kate/data/cmake.xml
2 ===================================================================
3 --- kate/data/cmake.xml (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
4 +++ kate/data/cmake.xml (.../branches/KDE/3.5/kdelibs) (revision 1021033)
6 <?xml version="1.0" encoding="UTF-8"?>
7 <!DOCTYPE language SYSTEM "language.dtd">
8 -<!-- Author: Alexander Neundorf <neundorf@kde.org> //-->
9 -<!-- cmake 2.0.3 syntax highlighting -->
10 -<!-- dsKeyword, dsDataType, dsDecVal, dsBaseN, dsFloat, dsChar, dsString, dsComment, dsOthers, new in KDE 3.3: dsAlert, dsFunction, dsRegionMarker, dsError -->
11 -<language name="CMake" version="1.03" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="">
13 + This file is part of KDE's kate project.
15 + Copyright 2004 Alexander Neundorf (neundorf@kde.org)
16 + Copyright 2005 Dominik Haumann (dhdev@gmx.de)
17 + Copyright 2007,2008 Matthew Woehlke (mw_triad@users.sourceforge.net)
19 + **********************************************************************
20 + * This library is free software; you can redistribute it and/or *
21 + * modify it under the terms of the GNU Lesser General Public *
22 + * License as published by the Free Software Foundation; either *
23 + * version 2 of the License, or (at your option) any later version. *
25 + * This library is distributed in the hope that it will be useful, *
26 + * but WITHOUT ANY WARRANTY; without even the implied warranty of *
27 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
28 + * Lesser General Public License for more details. *
30 + * You should have received a copy of the GNU Lesser General Public *
31 + * License along with this library; if not, write to the *
32 + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, *
33 + * Boston, MA 02110-1301, USA. *
34 + **********************************************************************
36 +<!-- generated for "cmake version 2.6-patch 2" -->
37 +<language name="CMake" version="1.06" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL">
40 <list name = "commands">
41 - <item> ABSTRACT_FILES </item>
42 <item> ADD_CUSTOM_COMMAND </item>
43 <item> ADD_CUSTOM_TARGET </item>
44 <item> ADD_DEFINITIONS </item>
46 <item> ADD_SUBDIRECTORY </item>
47 <item> ADD_TEST </item>
48 <item> AUX_SOURCE_DIRECTORY </item>
49 + <item> BREAK </item>
50 <item> BUILD_COMMAND </item>
51 <item> BUILD_NAME </item>
52 <item> CMAKE_MINIMUM_REQUIRED </item>
53 + <item> CMAKE_POLICY </item>
54 <item> CONFIGURE_FILE </item>
55 <item> CREATE_TEST_SOURCELIST </item>
56 + <item> DEFINE_PROPERTY </item>
59 + <item> ENABLE_LANGUAGE </item>
60 <item> ENABLE_TESTING </item>
61 <item> ENDFOREACH </item>
62 + <item> ENDFUNCTION </item>
64 <item> ENDMACRO </item>
65 + <item> ENDWHILE </item>
66 + <item> EXECUTE_PROCESS </item>
67 <item> EXEC_PROGRAM </item>
68 + <item> EXPORT </item>
69 <item> EXPORT_LIBRARY_DEPENDENCIES </item>
71 <item> FIND_FILE </item>
73 <item> FIND_PROGRAM </item>
74 <item> FLTK_WRAP_UI </item>
75 <item> FOREACH </item>
76 + <item> FUNCTION </item>
77 <item> GET_CMAKE_PROPERTY </item>
78 <item> GET_DIRECTORY_PROPERTY </item>
79 <item> GET_FILENAME_COMPONENT </item>
80 + <item> GET_PROPERTY </item>
81 <item> GET_SOURCE_FILE_PROPERTY </item>
82 <item> GET_TARGET_PROPERTY </item>
83 + <item> GET_TEST_PROPERTY </item>
85 <item> INCLUDE </item>
86 <item> INCLUDE_DIRECTORIES </item>
89 <item> MAKE_DIRECTORY </item>
90 <item> MARK_AS_ADVANCED </item>
92 <item> MESSAGE </item>
94 <item> OUTPUT_REQUIRED_FILES </item>
96 <item> QT_WRAP_UI </item>
98 <item> REMOVE_DEFINITIONS </item>
99 + <item> RETURN </item>
100 <item> SEPARATE_ARGUMENTS </item>
102 <item> SET_DIRECTORY_PROPERTIES </item>
103 + <item> SET_PROPERTY </item>
104 <item> SET_SOURCE_FILES_PROPERTIES </item>
105 <item> SET_TARGET_PROPERTIES </item>
106 <item> SITE_NAME </item>
107 - <item> SOURCE_FILES </item>
108 - <item> SOURCE_FILES_REMOVE </item>
109 <item> SOURCE_GROUP </item>
110 <item> STRING </item>
111 <item> SUBDIRS </item>
113 <item> TARGET_LINK_LIBRARIES </item>
114 <item> TRY_COMPILE </item>
115 <item> TRY_RUN </item>
116 - <item> USE_MANGLED_MESA </item>
117 + <item> UNSET </item>
118 <item> UTILITY_SOURCE </item>
119 <item> VARIABLE_REQUIRES </item>
120 + <item> VARIABLE_WATCH </item>
121 <item> VTK_MAKE_INSTANTIATOR </item>
122 <item> VTK_WRAP_JAVA </item>
123 <item> VTK_WRAP_PYTHON </item>
124 <item> VTK_WRAP_TCL </item>
125 - <item> WRAP_EXCLUDE_FILES </item>
126 <item> WRITE_FILE </item>
129 @@ -106,10 +139,13 @@
132 <item> BEFORE </item>
133 + <item> BRIEF_DOCS </item>
134 + <item> BUNDLE </item>
136 <item> CACHE_VARIABLES </item>
138 <item> CMAKE_FLAGS </item>
139 + <item> CMAKE_FIND_ROOT_PATH_BOTH </item>
141 <item> COMMAND </item>
142 <item> COMMANDS </item>
143 @@ -118,45 +154,62 @@
144 <item> COMPARE </item>
145 <item> COMPILE_FLAGS </item>
146 <item> COMPONENT </item>
147 + <item> COMPONENTS </item>
148 <item> CONFIGURATIONS </item>
149 + <item> CONFIGURE </item>
150 <item> COPYONLY </item>
151 <item> DEFINED </item>
152 <item> DEFINE_SYMBOL </item>
153 + <item> DEFINITION </item>
154 <item> DEPENDS </item>
155 <item> DESTINATION </item>
156 + <item> DIRECTORY </item>
157 <item> DIRECTORY_PERMISSIONS </item>
159 + <item> DOWNLOAD </item>
161 <item> ESCAPE_QUOTES </item>
162 + <item> EXACT </item>
163 <item> EXCLUDE </item>
164 <item> EXCLUDE_FROM_ALL </item>
165 <item> EXISTS </item>
166 - <item> EXPORT_MACRO </item>
167 + <item> EXPORT </item>
168 + <item> EXPR </item>
170 <item> EXTRA_INCLUDE </item>
171 <item> FATAL_ERROR </item>
174 <item> FILE_PERMISSIONS </item>
175 + <item> FILES_MATCHING </item>
177 - <item> FUNCTION </item>
178 + <item> FRAMEWORK </item>
179 + <item> FULL_DOCS </item>
180 <item> GENERATED </item>
183 <item> GLOB_RECURSE </item>
184 + <item> GLOBAL </item>
185 <item> GREATER </item>
186 <item> GROUP_SIZE </item>
187 <item> HEADER_FILE_ONLY </item>
188 <item> HEADER_LOCATION </item>
189 + <item> HINTS </item>
190 <item> IMMEDIATE </item>
191 <item> INCLUDES </item>
192 <item> INCLUDE_DIRECTORIES </item>
193 <item> INCLUDE_INTERNALS </item>
194 <item> INCLUDE_REGULAR_EXPRESSION </item>
195 + <item> INHERITED </item>
196 <item> INTERNAL </item>
197 + <item> IS_ABSOLUTE </item>
198 + <item> IS_NEWER_THAN </item>
199 + <item> LENGTH </item>
201 <item> LIBRARY </item>
202 <item> LINK_DIRECTORIES </item>
203 <item> LINK_FLAGS </item>
204 + <item> LINK_INTERFACE_LIBRARIES </item>
205 <item> LOCATION </item>
206 <item> MACOSX_BUNDLE </item>
207 <item> MACROS </item>
208 @@ -167,19 +220,33 @@
209 <item> MATCHES </item>
210 <item> MODULE </item>
212 + <item> NAMELINK_ONLY </item>
213 + <item> NAMELINK_SKIP </item>
214 + <item> NAMES </item>
215 <item> NAME_WE </item>
217 <item> NOTEQUAL </item>
218 + <item> NO_CMAKE_PATH </item>
219 + <item> NO_CMAKE_ENVIRONMENT_PATH </item>
220 + <item> NO_CMAKE_FIND_ROOT_PATH </item>
221 + <item> NO_DEFAULT_PATH </item>
222 + <item> NO_MODULE </item>
223 <item> NO_SYSTEM_PATH </item>
224 + <item> NO_SYSTEM_ENVIRONMENT_PATH </item>
225 <item> OBJECT_DEPENDS </item>
226 + <item> ONLY_CMAKE_FIND_ROOT_PATH </item>
227 <item> OPTIONAL </item>
229 <item> OUTPUT </item>
230 <item> OUTPUT_VARIABLE </item>
231 + <item> PARENT_SCOPE </item>
234 + <item> PATH_SUFFIXES </item>
235 <item> PATTERN </item>
236 <item> PERMISSIONS </item>
237 + <item> POLICY </item>
239 <item> POST_BUILD </item>
240 <item> POST_INSTALL_SCRIPT </item>
241 <item> PREFIX </item>
242 @@ -187,40 +254,60 @@
243 <item> PRE_BUILD </item>
244 <item> PRE_INSTALL_SCRIPT </item>
245 <item> PRE_LINK </item>
246 + <item> PRIVATE_HEADER </item>
247 <item> PROGRAM </item>
248 <item> PROGRAMS </item>
249 <item> PROGRAM_ARGS </item>
250 <item> PROPERTIES </item>
251 + <item> PUBLIC_HEADER </item>
252 + <item> PUSH </item>
254 + <item> RANDOM </item>
258 <item> REGULAR_EXPRESSION </item>
259 + <item> RELATIVE_PATH </item>
260 + <item> REMOVE </item>
261 + <item> REMOVE_RECURSE </item>
262 <item> RENAME </item>
263 <item> REPLACE </item>
264 <item> REQUIRED </item>
265 + <item> RESOURCE </item>
266 <item> RETURN_VALUE </item>
267 <item> RUNTIME </item>
268 <item> RUNTIME_DIRECTORY </item>
269 <item> SCRIPT </item>
270 <item> SEND_ERROR </item>
271 <item> SHARED </item>
272 + <item> SOURCE </item>
273 <item> SOURCES </item>
274 <item> STATIC </item>
275 <item> STATUS </item>
276 + <item> STRIP </item>
277 + <item> STRINGS </item>
278 <item> STREQUAL </item>
279 <item> STRGREATER </item>
280 <item> STRLESS </item>
281 <item> SUFFIX </item>
282 + <item> SUBSTRING </item>
283 <item> TARGET </item>
284 <item> TARGETS </item>
285 + <item> TIMEOUT </item>
286 <item> TOLOWER </item>
287 <item> TOUPPER </item>
288 + <item> TO_CMAKE_PATH </item>
289 + <item> TO_NATIVE_PATH </item>
290 <item> USE_SOURCE_PERMISSIONS </item>
292 + <item> VARIABLE </item>
293 <item> VARIABLES </item>
294 <item> VERSION </item>
295 + <item> VERSION_LESS </item>
296 + <item> VERSION_EQUAL </item>
297 + <item> VERSION_GREATER </item>
299 + <item> WORKING_DIRECTORY </item>
300 <item> WRAP_EXCLUDE </item>
303 Index: kioslave/ftp/ftp.cc
304 ===================================================================
305 --- kioslave/ftp/ftp.cc (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
306 +++ kioslave/ftp/ftp.cc (.../branches/KDE/3.5/kdelibs) (revision 1021033)
308 // The usual answer is '227 Entering Passive Mode. (160,39,200,55,6,245)'
309 // but anonftpd gives '227 =160,39,200,55,6,245'
311 - char *start = strchr(ftpResponse(3), '(');
312 + const char *start = strchr(ftpResponse(3), '(');
314 start = strchr(ftpResponse(3), '=');
320 - char *start = strchr(ftpResponse(3), '|');
321 + const char *start = strchr(ftpResponse(3), '|');
322 if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
325 Index: kinit/start_kdeinit.c
326 ===================================================================
327 --- kinit/start_kdeinit.c (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
328 +++ kinit/start_kdeinit.c (.../branches/KDE/3.5/kdelibs) (revision 1021033)
333 - sprintf( buf, "/proc/%d/oom_adj", pid );
334 + sprintf( buf, "/proc/%d/stat", pid );
336 /* Be paranoid and check that the pid we got from the pipe
337 belongs to this user. */
339 if( lstat( buf, &st ) < 0 || st.st_uid != getuid())
342 + sprintf( buf, "/proc/%d/oom_adj", pid );
343 procfile = open( buf, O_WRONLY );
344 if( procfile >= 0 ) {
346 Index: kio/kio/configure.in.in
347 ===================================================================
348 --- kio/kio/configure.in.in (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
349 +++ kio/kio/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 1021033)
354 - if test "$kde_cv_have_inotify" = "yes" ; then
355 + AC_CACHE_VAL(kde_cv_have_sys_inotify,
357 + kde_cv_have_sys_inotify=no
363 +#include <sys/inotify.h>
366 +#ifndef IN_ALL_EVENTS
367 +#error no inotify notification
369 + ],kde_cv_have_sys_inotify=yes,kde_cv_have_sys_inotify=no)
374 + if test "$kde_cv_have_inotify" = "yes" -o "$kde_cv_have_sys_inotify" = "yes"; then
375 AC_DEFINE_UNQUOTED(HAVE_INOTIFY, 1, [Define if your system has Linux Inode Notification])
376 + if test "$kde_cv_have_sys_inotify" = "yes"; then
377 + AC_DEFINE_UNQUOTED(HAVE_SYS_INOTIFY, 1, [Define if your system has glibc support for inotify])
382 Index: kio/kio/kdirwatch.cpp
383 ===================================================================
384 --- kio/kio/kdirwatch.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
385 +++ kio/kio/kdirwatch.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
388 #include <sys/ioctl.h>
391 +#ifdef HAVE_SYS_INOTIFY
392 +#include <sys/inotify.h>
397 #include <sys/syscall.h>
398 -#include <linux/types.h>
399 // Linux kernel headers are documented to not compile
400 #define _S390_BITOPS_H
401 #include <linux/inotify.h>
404 return syscall (__NR_inotify_rm_watch, fd, wd);
410 #define IN_ONLYDIR 0x01000000
414 #define IN_MOVE_SELF 0x00000800
419 #include <sys/utsname.h>
420 Index: kdecore/kstringhandler.cpp
421 ===================================================================
422 --- kdecore/kstringhandler.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
423 +++ kdecore/kstringhandler.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
426 const QChar *unicode = str.unicode();
427 for ( uint i = 0; i < str.length(); ++i )
428 - result += ( unicode[ i ].unicode() < 0x21 ) ? unicode[ i ] :
429 + result += ( unicode[ i ].unicode() <= 0x21 ) ? unicode[ i ] :
430 QChar( 0x1001F - unicode[ i ].unicode() );
433 Index: kdecore/Mainpage.dox
434 ===================================================================
435 --- kdecore/Mainpage.dox (.../tags/KDE/3.5.10/kdelibs) (revision 0)
436 +++ kdecore/Mainpage.dox (.../branches/KDE/3.5/kdelibs) (revision 1021033)
438 +/** \mainpage The KDE Core Library
440 +All KDE programs use this library to provide basic functionality such
441 +as the configuration system, IPC, internationalization and locale
442 +support, site-independent access to the filesystem and a large number
443 +of other (but no less important) things.
445 +All KDE applications should link to the kdecore library. Also, using a
446 +KApplication derived class instead of QApplication is almost
447 +mandatory if you expect your application to behave nicely within the
450 +If you are unsure where to start, have a look at the
451 +<a href="http://techbase.kde.org/Development/Tutorials">tutorials on
452 +TechBase</a> to get you going.
454 +If you know what you are looking for, you should be able to find it in
455 +the <a href="annotated.html">class list</a> or the
456 +<a href="modules.html">modules list</a>.
459 +Various: see copyrights on individual files for more information
463 +<a href="http://websvn.kde.org/trunk/KDE/kdelibs/kdecore/MAINTAINERS?view=markup">MAINTAINERS</a>
468 +Some helper utilities: @gpl
474 +\defgroup KDEMacros KDE Macros
478 +// DOXYGEN_EXCLUDE = malloc kde_file.h
479 +// DOXYGEN_SET_INPUT += @topdir@/kdemacros.h.cmake
480 +// DOXYGEN_SET_PROJECT_NAME = KDECore
481 +// vim:ts=4:sw=4:expandtab:filetype=doxygen
482 Index: khtml/html/htmltokenizer.cpp
483 ===================================================================
484 --- khtml/html/htmltokenizer.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
485 +++ khtml/html/htmltokenizer.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
488 kdDebug( 6036 ) << "unknown entity!" << endl;
492 // ignore the sequence, add it to the buffer as plaintext
494 for(unsigned int i = 0; i < cBufferPos; i++)
495 Index: khtml/rendering/table_layout.cpp
496 ===================================================================
497 --- khtml/rendering/table_layout.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
498 +++ khtml/rendering/table_layout.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
501 for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
502 if ( width[i].isPercent() ) {
503 - int w = base * width[i].value() / totalPercent;
504 + // totalPercent may be 0 below if all %-width specifed are 0%. (#172557)
505 + int w = totalPercent ? base * width[i].value() / totalPercent : 0;
511 for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
512 if ( width[i].isVariable() ) {
513 - int w = available / totalVariable;
514 + // totalVariable may be 0 below if all the variable widths specified are 0.
515 + int w = totalVariable ? available / totalVariable : 0;
519 Index: kdoctools/customization/pt-BR/user.entities
520 ===================================================================
521 --- kdoctools/customization/pt-BR/user.entities (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
522 +++ kdoctools/customization/pt-BR/user.entities (.../branches/KDE/3.5/kdelibs) (revision 1021033)
524 <!ENTITY Esc "<keycap>Esc</keycap>">
525 <!ENTITY etc "<abbrev>etc</abbrev>">
526 <!ENTITY ex "<abbrev>por exemplo</abbrev>">
527 -<!ENTITY FAQ "Perguntas Mais Freqüentes (do inglês <acronym>FAQ</acronym>)">
528 +<!ENTITY FAQ "Perguntas mais freqüentes (do inglês <acronym>FAQ</acronym>)">
529 <!ENTITY HTML '<acronym>HTML</acronym>'>
530 <!ENTITY ie "isto é">
531 <!ENTITY infocenter "<application>Centro de Informações</application>">
533 <!ENTITY LMB "botão <mousebutton>esquerdo</mousebutton> do mouse">
534 <!ENTITY MMB "botão do <mousebutton>meio</mousebutton> do mouse">
535 <!ENTITY OS "<acronym>Sistema Operacional</acronym>">
536 -<!ENTITY RMB "botão <mousebutton>direto</mousebutton> do mouse">
537 +<!ENTITY RMB "botão <mousebutton>direito</mousebutton> do mouse">
538 <!ENTITY Shift "<keycap>Shift</keycap>">
539 <!ENTITY systemtray "<application>bandeja do sistema</application>">
540 <!ENTITY Tab "<keycap>Tab</keycap>">
541 Index: kdeui/kdatetbl.cpp
542 ===================================================================
543 --- kdeui/kdatetbl.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
544 +++ kdeui/kdatetbl.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
546 #include "kdatetbl.h"
547 #include "kpopupmenu.h"
548 #include <qdatetime.h>
549 +#include <qguardedptr.h>
552 #include <qpainter.h>
554 painter->setPen(colorGroup().highlight());
555 painter->setBrush(colorGroup().highlight());
560 painter->setPen(colorGroup().text());
561 painter->setBrush(colorGroup().text());
563 void KDateTable::endOfWeek()
565 setDate(date.addDays(7 - date.dayOfWeek()));
570 KDateTable::keyPressEvent( QKeyEvent *e )
571 @@ -482,14 +483,14 @@
572 // old selected date:
573 temp = posFromDate( date );
574 // new position and date
575 - pos = (7 * (row - 1)) + col;
576 + pos = (7 * (row - 1)) + col;
577 QDate clickedDate = dateFromPos( pos );
579 // set the new date. If it is in the previous or next month, the month will
580 // automatically be changed, no need to do that manually...
581 setDate( clickedDate );
583 - // call updateCell on the old and new selection. If setDate switched to a different
584 + // call updateCell on the old and new selection. If setDate switched to a different
585 // month, these cells will be painted twice, but that's no problem.
586 updateCell( temp/7+1, temp%7 );
587 updateCell( row, col );
588 @@ -1007,7 +1008,10 @@
592 + const QGuardedPtr<QObject> that = this;
595 + return QDialog::Rejected;
599 Index: kdeui/kmenubar.cpp
600 ===================================================================
601 --- kdeui/kmenubar.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
602 +++ kdeui/kmenubar.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
604 if( d->fallback_mode )
606 d->fallback_mode = false;
607 -// KWin::setStrut( winId(), 0, 0, 0, 0 ); KWin will set strut as it will see fit
608 + KWin::setStrut( winId(), 0, 0, 0, 0 );
609 setMinimumSize( 0, 0 );
610 setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
613 Property changes on: .
614 ___________________________________________________________________
615 Deleted: svn:mergeinfo
617 + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin