various adjustments and cleanups

This commit is contained in:
Ivailo Monev 2015-09-03 05:30:13 +00:00
parent f8cb88dc26
commit 5ad7281134
52 changed files with 107 additions and 1131 deletions

View file

@ -21,8 +21,8 @@ macro_optional_add_subdirectory (kfilereplace)
# NOTE: you will need kdoctools from kdelibs ported for the help KIO slave
macro_optional_add_subdirectory (khelpcenter)
macro_optional_add_subdirectory (kaffeine)
macro_optional_add_subdirectory (kamoso)
# macro_optional_add_subdirectory (kamoso)
macro_optional_add_subdirectory (kcachegrind)
macro_optional_add_subdirectory (kdepimlibs)
macro_optional_add_subdirectory (kdepim-runtime)
macro_optional_add_subdirectory (kdepim)
# macro_optional_add_subdirectory (kdepimlibs)
# macro_optional_add_subdirectory (kdepim-runtime)
# macro_optional_add_subdirectory (kdepim)

View file

@ -4,6 +4,6 @@ set(dtvdaemon_SRCS
log.cpp
main.cpp)
kde4_add_executable(dtvdaemon ${dtvdaemon_SRCS})
add_executable(dtvdaemon ${dtvdaemon_SRCS})
target_link_libraries(dtvdaemon ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY})
install(TARGETS dtvdaemon ${INSTALL_TARGETS_DEFAULT_ARGS})

View file

@ -39,7 +39,7 @@ endif(HAVE_DVB)
configure_file(config-kaffeine.h.cmake ${CMAKE_BINARY_DIR}/config-kaffeine.h)
kde4_add_executable(kaffeine ${kaffeinedvb_SRCS} ${kaffeine_SRCS})
add_executable(kaffeine ${kaffeinedvb_SRCS} ${kaffeine_SRCS})
target_link_libraries(kaffeine ${QT_QTSQL_LIBRARY} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS}
${KDE4_SOLID_LIBS} ${X11_Xscreensaver_LIB} ${VLC_LIBRARY})
install(TARGETS kaffeine ${INSTALL_TARGETS_DEFAULT_ARGS})

View file

@ -26,16 +26,19 @@ set(kamoso_SRCS
kipiaction.cpp
webcamdialog.cpp
pagewebcamconfigmanager.cpp
mainWidget.ui
generalConfig.ui
pictureConfig.ui
videoConfig.ui
)
qt4_add_dbus_interface(kamoso_SRCS
org.kde.Solid.PowerManagement.xml
brightness_interface)
set(kamoso_UI mainWidget.ui generalConfig.ui pictureConfig.ui videoConfig.ui)
set(kamoso_UI )
kde4_add_kcfg_files(kamoso_SRCS settings.kcfgc)
kde4_add_ui_files(kamoso_SRCS ${kamoso_UI})
kde4_add_executable(kamoso ${kamoso_SRCS})
add_executable(kamoso ${kamoso_SRCS})
target_link_libraries(kamoso ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS}
${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KUTILS_LIBS} ${KIPI_LIBRARIES} ${SolidControl} ${QTGSTREAMER_LIBRARY} ${QTGSTREAMER_UI_LIBRARY})

View file

@ -7,7 +7,7 @@ set(pluginTester_SRCS
fakeimagecollectionshared.cpp
)
kde4_add_executable(kamosoPluginTester ${pluginTester_SRCS})
add_executable(kamosoPluginTester ${pluginTester_SRCS})
target_link_libraries(kamosoPluginTester ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBRARY} ${KIPI_LIBRARIES})

View file

@ -1,9 +1,6 @@
add_subdirectory(icons)
set(youtube_SRCS youtubemanager.cpp kipiplugin_youtube.cpp youtubejob.cpp youtubejobcomposite.cpp)
set(youtube_UI videoInfo.ui)
kde4_add_ui_files(youtube_SRCS ${youtube_UI})
set(youtube_SRCS youtubemanager.cpp kipiplugin_youtube.cpp youtubejob.cpp youtubejobcomposite.cpp videoInfo.ui)
kde4_add_plugin(kipiplugin_youtube ${youtube_SRCS})
target_link_libraries(kipiplugin_youtube

View file

@ -1,6 +0,0 @@
2011/11/14
* KCachegrind: use callgrind_control to request a dump.
The old way will not work with Callgrind in VG > 3.7
2011/9/23
* Compiles without Qt3 support

View file

View file

@ -3,19 +3,14 @@ include_directories( ../libcore ../libviews )
########### next target ###############
set(kcachegrind_SRCS
main.cpp
kdeconfig.cpp
toplevel.cpp
configdlg.cpp
)
main.cpp
kdeconfig.cpp
toplevel.cpp
configdlg.cpp
configdlgbase.ui
)
kde4_add_ui_files(kcachegrind_SRCS
configdlgbase.ui
)
kde4_add_app_icon(kcachegrind_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kcachegrind.png")
kde4_add_executable(kcachegrind ${kcachegrind_SRCS})
add_executable(kcachegrind ${kcachegrind_SRCS})
target_link_libraries(kcachegrind core views ${KDE4_KIO_LIBS})

View file

@ -1,441 +0,0 @@
Later versions
Please use the gitweb log at http://repo.or.cz/w/kdbg.git to browse
the changes.
Version 2.0.4
Fixed encoding of the Czech translation thanks to Jakub Galgonek.
Added support for QString in Qt4's debug libraries.
Fixed that the debugger window really comes to the foreground and
receives the focus when the debuggee stops at a breakpoint, when this
option is on (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=171845).
Added a filter edit box to the Attach to Process dialog to improve
usability.
Version 2.0.3
Fixed parsing of gdb output that mentions "operator<<", "operator>>",
"operator<", and "operator>" within text delimited by angle brackets <>.
This fixes a crash when any such function is disassembled and other
misbehaviors.
Fixed parsing stack frames that mention "operator<<" or "operator<".
Thanks to Charles Samuels, who pointed out the problem and provided
an initial fix.
Version 2.0.2
Fixed stack display for functions in an anonymous namespace and
for functions whose names involve template parameter lists (thanks to
André Wöbbeking).
Fixed environment list which would add back the entry from the edit box
even if it was just deleted.
Fixed that the Run/Continue button was enabled while the program was
running.
Fixed parsing of NaN (Not a Number) floating point values.
Version 2.0.1
Updated Hungarian translation (thanks to Tamas Szanto).
Worked around gdb 6.3 crashes at "info line main" command (thanks to
Stefan Taferner).
Updated XSLT debugger parser for xsldbg >= 3.4.0 (by Keith Isdale).
Version 2.0.0
References and const types are treated like the base type (thanks to
Shaheed).
Fixed parsing of large arrays with many different values, which were
terminated by "...".
Fixed the kdbg.desktop file: Encoding is UTF-8, install in XDG menu
location.
Fixed PS_COMMAND detection for Solaris' /bin/sh.
Version 1.9.7
Added a new animated button in the toolbar.
Fixed Norwegian translation file names.
Version 1.9.6
"<invalid float value>" in register dumps was not parsed correctly.
Fixed that variable popup location was computed incorrectly if tab
width is not 0.
Updated the manual.
Implemented printing of Qt4's QStrings.
Version 1.9.5
Fixed some issues when the items in the environment variable list
are selected.
Added a command line option to attach to a process (thanks to
Matthew Allen for the initial code).
Fixed the "Using host libthread_db" error message properly.
Fixed inappropriate icon sizes.
Version 1.9.4
Updated the build system to the latest auto* tools.
Worked around the problem that gdb reports "Using host libthread_db"
on Fedora Core when it processes the file command.
Version 1.9.3
Improved editing of values; it is now possible to edit variables also
in the watch window.
Version 1.9.2
The previous security fix only protects against accidents, not attacks,
as Matt Zimmerman pointed out. Did it right this time.
Basic editing of values in the local variables window is available.
More refinements are still necessary.
Version 1.9.1
Fixed security flaw regarding the program specific debugger command.
Configurable key bindings.
Version 1.9.0
Program arguments that are file names can be browsed for.
Added XSLT debugging (using xsldbg) by Keith Isdale.
The program counter can be changed via point and click.
Improved register formating by Daniel Kristjansson.
"Orphaned breakpoints", i.e. breakpoints that gdb cannot set
immediately, can be set. This helps debug shared libraries and
dynamically loaded modules.
Version 1.2.10
Fixed the "Using host libthread_db" error message.
Fixed inappropriate icon sizes.
Version 1.2.9
The previous security fix only protects against accidents, not attacks,
as Matt Zimmerman pointed out. Did it right this time.
Version 1.2.8
Fixed security flaw regarding the program specific debugger command.
Version 1.2.7
Fixed parsing of stack frames for recent gdbs.
Support vector registers (thanks to Daniel Thor Kristjansson for
initial code).
Work around bug in some gdbs which inhibits printing of QString values.
Version 1.2.6
Opening the Find dialog no longer toggles a breakpoint.
Make mouse wheel work (again) in source, variables, and watch windows.
When a pointer to a struct is expanded the struct is also expanded.
Improved toolbar and application icons.
Version 1.2.5
Now compiles for KDE 3.
Fixed make install for builddir != srcdir.
Fixed status bar flicker. This gives a nice speed-up by a factor of 4
when the contents of an array of 50 QStrings are displayed!
Version 1.2.4
Now compiles for KDE 3 (Beta1).
Support QString of Qt 3.x.
Improved (and fixed) the display of arrays with repeated values.
Fixed crash when a file is reloaded while disassembled code is
displayed.
Fixed parsing of stack frames involving signal handler invocations.
Version 1.2.3
Fixed invisible toolbar under KDE 2.x (really, this time, I promise).
Fixed crash when no line has the cursor (empty files).
Don't display a blank page when a non-existing file was tried to open.
Version 1.2.2
Fixed a special, but common case where removing a breakpoint didn't
work but add more on the same line instead (thanks to Ron Lerech).
Fixed invisible toolbar under KDE 2.1.2 (thanks to Neil Butterworth).
Fixed compilation for gcc 3.0 (thanks to Ben Burton):
Fixed make install if srcdir != builddir.
Changed encoding of German translations (and also Danish, Italian,
Norwegian, Romanian, Slovak, Swedish) to UTF-8, which fixes message
strings under KDE2 (at least for German - couldn't test the others).
Version 1.2.1
Working directory can be browsed for.
Added context menu to move the selected expression from the local
variables window to the watch window.
Fixed crash when environment variables are removed.
Fixed problems with trailing backslashes in watched expressions.
Fixed compilation on FreeBSD (openpty).
Version 1.2.0
Translations for: Hungarian, Japanese, Norwegian (Nynorsk), Serbian,
Turkish
Updated the User's Manual (English, Russian (thanks, Ilmar!), German).
Version 1.1.7beta1
Improved the program icon; made the installation more KDE2 compliant.
Enabled mouse wheel scrolling at various places.
Version 1.1.6
Added memory display.
Single-stepping by instruction.
Watchpoints. Finally! (On Linux/i386 works best with gdb 5!)
Version 1.1.5
Made Delete key work in the watch window.
Breakpoints can be enabled and disabled in the breakpoint list.
Detach from debugged program on exit (and when new program is debugged).
Added a list of recently opened executables (thanks to
Thomas Sparr <thomas.sparr@kreatel.se>).
Version 1.1.4
Fixed endless loop on shutdown.
Brought in line with KDE 1.91 (KDE 2 beta).
Version 1.1.3
Debugging of multi-threaded programs. Requires a gdb that supports
multi-threaded programs, like gdb 5.
Debugger window pops into the foreground when the program stops.
Made tab width a user-settable option.
Version 1.1.2
Display disassembled code.
Version 1.1.1
Use the KDE system fixed font for the source code window.
By default, do not log communication with gdb.
Added an integrated output window (based on code by Judin Max).
Program specific settings can be set. In particular: the debugger
command (required if you are debugging remote devices), the
terminal emulation needed for the program.
Verison 1.1.0
Use docking windows thanks to Judin Max <novaprint@mtu-net.ru>.
Added a register dump window. Based on code by Judin Max.
Implemented "balloons" (tool tips) that show variable values.
./configure fix for NetBSD thanks to
Berndt Josef Wulf <wulf@ping.net.au>.
There's now a Swedish translation thanks to
Örjan Lindbergh <orjan.lindbergh@telia.com>.
Version 1.0.2
Save and restore watched expressions.
More adjustments for the KRASH release.
Show <repeat...> count in QStrings like in normal C strings instead
of repeating the characters.
Use QListView instead of KTabListBox.
Version 1.0.1
Added a hack to set a remote target. Thanks to
Johnny Chan <johnnykc@iprg.nokia.com>.
Display function arguments. Based on suggestions by Johnny Chan.
KDE 2 fixes.
Support builddir != srcdir.
Version 1.0.0
Brought up-to-date for latest KDE 2.
Version 1.0beta3
Removal of minor misfeatures.
Prepared for KDE 2 and Qt 2 (it's a configure option:
--with-kde-version=2).
Added Russian documentation (thanks to
Ilmar S. Habibulin <ilmar@ints.ru>) and German documentation.
There is now a Spanish translation thanks to
Manuel Soriano <manu@europa3.com>.
Version 1.0beta2
Recognize strings with repeated characters: 'x' <repeats 34 times>.
Fix structs with no (additional) data members and other fixes
for gdb 4.18.
Save window size across sessions.
There is now an Italian translation thanks to
Massimo Morin <mmorin@schedsys.com>.
Version 1.0beta1
Fixed non-displaying QString (Qt2) with certain gdb 4.17's (at least
mine here, of SuSE 6.1, had a problem :-)
Fixed cases where gdb commands where executed after debuggee has exited.
Do not execute gdb commands after an interrupt.
Updated some translations. Still most are incomplete. Please help!
There is now a Polish translation thanks to
Jacek Wojdel <wojdel@kbs.twi.tudelft.nl>.
Version 0.3.1
The working directory for the program being debugged can be set
(Execution|Arguments).
There's now a global options dialog in place (File|Global Options).
At the moment the debugger program (which must be gdb, but it could be
an experimental gdb version, for example) and the terminal for program
output can be specified.
Fixed Makefiles to support make DESTDIR=/tmp/foo install (which is
needed by packagers and to create relocatable RPMs).
There's now a Danish translation thanks to
Steen Rabol <rabol@get2net.dk>.
Version 0.3.0
Starting with this version, Qt 1.42 and KDE 1.1 is required.
Ported to Qt 2.0 and KDE post-1.1! KDbg now runs with both
KDE 1.1 (using Qt 1.42) and the latest experimental KDE. You can of
course run one version and debug programs written for the other version.
KDbg can now display Qt 2.0's QString values (which are Unicode
strings)!
Environment variables can be set. Changes become effective the next time
the program being debugged is run.
The breakpoint list has been improved. It disables command buttons at
times when it is not possible to change breakpoints. The icons that
show the breakpoint status are now the same as those in the source
window.
Popup menus (context menus) for frequently used commands have been added
to the source code window (thanks to Tom Nguyen <ttomnguyen@yahoo.com>)
There's now a Russian translation thanks to
Ilmar Habibulin <ilmar@ints.ru>.
Internal restructuring. These changes are invisible. They just make
future extensions less cumbersome.
Version 0.2.5
This is the last version that supports Qt 1.33 and KDE 1.0.
There's now a Czech translation thanks to
Martin Spirk <spirk@kla.pvt.cz>.
Recognize and report when gdb dies unexpectedly. This happens commonly
when writing CORBA programs since gdb obviously has problems in
debugging C++ classes with virtual base classes.
Added conditional breakpoints and ignore counts.
Version 0.2.4
Added a toolbar button to load the executable. The button to open a
source file is still there. I hope it's clear which one does what.
Attaching to a running process is now possible (Execution|Attach).
Made more visible when gdb is busy using a gear wheel in the upper right
corner of the window like kfm.
Made the KTreeView widget more flexible by adding a bunch of virtual
keywords. (No, this doesn't have any influence on the look and feel of
KDbg.) While doing that, I fixed a small repainting bug.
ChangeLog starts here.

View file

@ -1,36 +0,0 @@
KDbg Release Notes for version 2.2.0
====================================
The 2.2.x series is still based on Qt 3 and KDE 3.
Changes since 2.1.1
-------------------
Features:
- Source code windows have now a tab attached, which makes switching
source files much easier.
- Source code windows now show line numbers at the left.
- There are now "Find Next" and "Find Previous" commands with shortcuts
F3 and Shift+F3.
- Improved support of template types in the type tables (which are used
to show structure members next to a structure variable). Notably, the
number of elements in STL and Qt collection classes are shown.
- Arguments for the debugged program can be passed on KDbg's command line.
Bug fixes
- An incorrect terminal command string setting could crash KDbg if it
contained format specifiers other than exactly one '%s'.
- The format specifier in the memory dump window was not correctly
preserved when the expression is changed.
- Setting a conditional breakpoint could crash KDbg.
- Using Attach on systems that use the simplified Attach to Process dialog
could crash KDbg.

View file

@ -1,23 +0,0 @@
KDbg Release Notes for version 2.2.1
====================================
The 2.2.x series is still based on Qt 3 and KDE 3.
Changes since 2.2.0
-------------------
Bug fixes
- Compilation with newer glibc failed.
- A crash could occur when the variable window was updated.
- A crash when command line switch -a was used together with a non-existing
executable name.
- Syntax highlighting was applied to all files, not just C/C++.
- The display was incorrect when a file was reloaded that had disassembly
lines visible.
There are also some minor documentation fixes.

View file

@ -1,11 +0,0 @@
KDbg Release Notes for version 2.2.2
====================================
The 2.2.x series is still based on Qt 3 and KDE 3.
Changes since 2.2.1
-------------------
There is only one bug fix:
- An error message was shown instead of assembler code when gdb 7.1 was used.

View file

@ -1,22 +0,0 @@
KDbg Release Notes for version 2.5.0
====================================
This release is based on KDE4 and Qt4.
Changes since 2.2.2
-------------------
- A number of icons were exchanged with Oxygen icons. These are not part
of KDbg's source code.
- Session state per debugged program is now stored in a section in $KDEHOME
rather than in a .kdbgrc file in the program's directory. This allows to
debug programs that are located in unwritable directories. But this also
means that earlier session information is disregarded.
- More accurate parsing of GDB responses of various commands fixed bugs in
certain areas, in particular, temporary breakpoints, register values,
truncated struct values, disassembly (again).
- "View Code" from the breakpoint list can open the source code in more cases.

View file

@ -1,21 +0,0 @@
KDbg Release Notes for version 2.5.1
====================================
Changes since 2.5.0
-------------------
Minor feature enhancements
- .hpp files undergo syntax highlighting.
- Keys j and k can be used to move the cursor position in the source code.
Bug fixes
- Cooperation with newer GDB (7.2 and 7.3) is improved:
. wchar_t strings as printed by GDB 7.2 are recognized;
. the thread list was missing with GDB 7.3;
. program exit was not detected (also GDB 7.3).
- Enum values in anonymous namespaces are now recognized.

View file

@ -1,14 +0,0 @@
KDbg Release Notes for version 2.5.2
====================================
Changes since 2.5.1
-------------------
Bug fixes
- Support for GDB 7.5.
- More of GDB's output is recognized in some corner cases
- The thread list parser introduced in 2.5.1 sometimes stripped two letters
from the function name.

View file

@ -1,19 +0,0 @@
KDbg Release Notes for version 2.5.3
====================================
Changes since 2.5.2
-------------------
Bug fixes
- Duplicated and <MULTIPLE> breakpoints do not increase the list of
breakpoints each time a session is started
- Communication with a localized GDB works; this is achieved by setting
LC_ALL=C, which is also propagated to the program being debugged. If
The program needs a different locale, set it in Execution->Arguments,
page Environment.
- Fixed a crash in the memory window
- Updates of the Russian and Croatian translations.

View file

@ -1,18 +0,0 @@
KDbg Release Notes for version 2.5.4
====================================
Changes since 2.5.3
-------------------
Bug fixes
- Source file names with international characters are handled better.
- When an executable is loaded, GDBs of different vintage print different
text, some of which were treated as error text incorrectly, leading to
failed debugging sessions. More of these texts are now ignored.
- Variables pointing to some global variable lacked the ability to be
expanded with recent GDBs.
- Parsing of string values residing in global variables was fixed.

View file

@ -1,18 +0,0 @@
KDbg Release Notes for version 2.5.5
====================================
Changes since 2.5.4
-------------------
Bug fixes
- A crash when the hotkey settings are changed was fixed.
- The animation button was regenerated to avoid a crash with modern Qt.
Thanks to Armin Felder for the initial fix.
- Pretty-printers and GDB Python extensions were disabled, because they
would interfere with the output parser.
- Recent GDBs do not terminate on receipt of SIGTERM, keeping KDbg
running for 20 seconds. This was fixed.

View file

@ -1,67 +0,0 @@
%define name kdbg
%define version 2.5.4
%define release 1.kde4
%define prefix /usr
%define src_dir %{name}-%{version}
%define builddir $RPM_BUILD_DIR/%{name}-%{version}
Summary: KDbg - KDE Debugging GUI around gdb
Name: %{name}
Version: %{version}
Release: %{release}
Prefix: %{prefix}
Group: X11/KDE/Development
License: GPL
Distribution: RedHat 7.0
Vendor: Johannes Sixt <j6t@kdbg.org>
Packager: Ullrich von Bassewitz <uz@musoftware.de>
Source: %{name}-%{version}.tar.gz
URL: http://www.kdbg.org/
Requires: kdelibs >= 2.0
BuildRoot: /tmp/build-%{name}-%{version}
%description
KDbg is a graphical user interface to gdb, the GNU debugger. It provides
an intuitive interface for setting breakpoints, inspecting variables, and
stepping through code.
%prep
rm -rf $RPM_BUILD_ROOT
rm -rf %{builddir}
%setup
touch `find . -type f`
%build
rm -f CMakeCache.txt
cmake . -DCMAKE_INSTALL_PREFIX=/usr
make -j4
%install
if [ -z "$KDEDIR" ]; then
export KDEDIR=%{prefix}
fi
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
cd $RPM_BUILD_ROOT
find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > \
$RPM_BUILD_DIR/file.list.%{name}
find . -type f | sed -e 's,^\.,\%attr(-\,root\,root) ,' \
-e '/\/config\//s|^|%config|' >> \
$RPM_BUILD_DIR/file.list.%{name}
find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> \
$RPM_BUILD_DIR/file.list.%{name}
echo "%docdir $KDEDIR/share/doc/HTML" >> $RPM_BUILD_DIR/file.list.%{name}
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{builddir}
rm -f $RPM_BUILD_DIR/file.list.%{name}
%files -f ../file.list.%{name}

View file

@ -19,24 +19,24 @@ FIND_PROGRAM(PROG_PS ps)
IF (PROG_PS)
set(PS_ARGS -eo pid,ppid,uid,vsz,etime,time,args)
execute_process(COMMAND ${PROG_PS} ${PS_ARGS}
RESULT_VARIABLE PS_FAILED
OUTPUT_QUIET ERROR_QUIET)
RESULT_VARIABLE PS_FAILED
OUTPUT_QUIET ERROR_QUIET)
IF (NOT PS_FAILED)
execute_process(
COMMAND ${PROG_PS} ${PS_ARGS}
COMMAND sed -e "s/ */ /g" -e 1q
OUTPUT_VARIABLE PS_HEADER)
string(STRIP "${PS_HEADER}" PS_HEADER)
IF (PS_HEADER STREQUAL "PID PPID UID VSZ ELAPSED TIME COMMAND")
# enclose arguments in double-quotes
set(PS_COMMAND \"${PROG_PS}\")
set(PS_MSG ${PROG_PS})
foreach (I ${PS_ARGS})
set(PS_COMMAND ${PS_COMMAND},\"${I}\")
set(PS_MSG "${PS_MSG} ${I}")
endforeach (I)
message("-- Found 'ps' command: ${PS_MSG}")
ENDIF (PS_HEADER STREQUAL "PID PPID UID VSZ ELAPSED TIME COMMAND")
execute_process(
COMMAND ${PROG_PS} ${PS_ARGS}
COMMAND sed -e "s/ */ /g" -e 1q
OUTPUT_VARIABLE PS_HEADER)
string(STRIP "${PS_HEADER}" PS_HEADER)
IF (PS_HEADER STREQUAL "PID PPID UID VSZ ELAPSED TIME COMMAND")
# enclose arguments in double-quotes
set(PS_COMMAND \"${PROG_PS}\")
set(PS_MSG ${PROG_PS})
foreach (I ${PS_ARGS})
set(PS_COMMAND ${PS_COMMAND},\"${I}\")
set(PS_MSG "${PS_MSG} ${I}")
endforeach (I)
message("-- Found 'ps' command: ${PS_MSG}")
ENDIF (PS_HEADER STREQUAL "PID PPID UID VSZ ELAPSED TIME COMMAND")
ENDIF (NOT PS_FAILED)
ENDIF (PROG_PS)
IF (NOT PS_COMMAND)
@ -67,20 +67,13 @@ set(kdbg_SRCS
watchwindow.cpp
dbgmainwnd.cpp
main.cpp
)
set(kdbg_UI
brkptbase.ui
brkptcondition.ui
pgmargsbase.ui
procattachbase.ui
)
kde4_add_ui_files(kdbg_SRCS ${kdbg_UI})
kde4_add_app_icon(kdbg_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-kdbg.png")
kde4_add_app_icon(kdbg_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/lo*-app-kdbg.png")
kde4_add_executable(kdbg ${kdbg_SRCS})
add_executable(kdbg ${kdbg_SRCS})
IF (HAVE_LIB_UTIL)
set(LIB_UTIL util)

View file

@ -369,4 +369,4 @@ ConditionalDlg::~ConditionalDlg()
}
#include "brkpt.moc"
#include "moc_brkpt.cpp"

View file

@ -457,4 +457,4 @@ Breakpoint::Breakpoint() :
lineNo(0)
{ }
#include "dbgdriver.moc"
#include "moc_dbgdriver.cpp"

View file

@ -1255,4 +1255,4 @@ void DebuggerMainWnd::slotConfigureKeys()
KShortcutsDialog::configure(actionCollection());
}
#include "dbgmainwnd.moc"
#include "moc_dbgmainwnd.cpp"

View file

@ -2194,4 +2194,4 @@ void KDebugger::handleSetVariable(CmdQueueItem* cmd, const char* output)
}
#include "debugger.moc"
#include "moc_debugger.cpp"

View file

@ -5,7 +5,7 @@
*/
#include "exprwnd.h"
#include "exprwnd.moc"
#include "moc_exprwnd.cpp"
#include "typetable.h"
#include <QHeaderView>
#include <QStringList>

View file

@ -2790,4 +2790,4 @@ QString GdbDriver::parseSetVariable(const char* output)
}
#include "gdbdriver.moc"
#include "moc_gdbdriver.cpp"

View file

@ -283,4 +283,4 @@ void MemoryWindow::restoreProgramSpecific(KConfigBase* config)
}
#include "memwindow.moc"
#include "moc_memwindow.cpp"

View file

@ -220,4 +220,4 @@ void PgmArgs::on_insertDir_clicked()
}
}
#include "pgmargs.moc"
#include "moc_pgmargs.cpp"

View file

@ -108,4 +108,4 @@ ProgramSettings::ProgramSettings(QWidget* parent, QString exeName) :
addPage(&m_output, i18n("Output"));
}
#include "pgmsettings.moc"
#include "moc_pgmsettings.cpp"

View file

@ -327,4 +327,4 @@ ProcAttach::~ProcAttach()
}
#include "procattach.moc"
#include "moc_procattach.cpp"

View file

@ -609,4 +609,4 @@ void RegisterView::paletteChange(const QPalette&)
setFont(KGlobalSettings::fixedFont());
}
#include "regwnd.moc"
#include "moc_regwnd.cpp"

View file

@ -960,4 +960,4 @@ int HighlightCpp::highlight(const QString& text, int state)
return state;
}
#include "sourcewnd.moc"
#include "moc_sourcewnd.cpp"

View file

@ -128,4 +128,4 @@ void ThreadList::slotCurrentChanged(QTreeWidgetItem* newItem)
}
#include "threadlist.moc"
#include "moc_threadlist.cpp"

View file

@ -222,4 +222,4 @@ void TTYWindow::slotClear()
m_pos.movePosition(QTextCursor::End);
}
#include "ttywnd.moc"
#include "moc_ttywnd.cpp"

View file

@ -91,4 +91,4 @@ void WatchWindow::slotWatchHighlighted()
m_watchEdit.setText(text);
}
#include "watchwindow.moc"
#include "moc_watchwindow.cpp"

View file

@ -422,4 +422,4 @@ void FindDialog::done(int result)
emit closed();
}
#include "winstack.moc"
#include "moc_winstack.cpp"

View file

@ -1391,4 +1391,4 @@ XsldbgDriver::parseSetVariable(const char */*output*/)
}
#include "xsldbgdriver.moc"
#include "moc_xsldbgdriver.cpp"

View file

@ -1,7 +1,7 @@
project(kdepimlibs)
# where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ###############
@ -61,7 +61,7 @@ endif()
# CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
# in the KDE build system, this is the same as CMAKE_BINARY_DIR.
configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake)
############### Find the stuff we need ###############
@ -246,23 +246,14 @@ write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVers
VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}
COMPATIBILITY SameMajorVersion)
set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs/cmake)
# places where find_package() looks for FooConfig.cmake files:
# CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
# lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
# option to have kdepimlibs install its Config file there. Alex
if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KdepimLibs)
endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVersion.cmake
${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfig.cmake
DESTINATION ${_KdepimLibsConfig_INSTALL_DIR} )
DESTINATION ${LIB_INSTALL_DIR}/cmake/KdepimLibs)
# Install the file with the exported targets, use ${KDEPIMLIBS_TARGET_PREFIX} as prefix for the names of these targets, Alex
install(EXPORT kdepimlibsLibraryTargets
NAMESPACE ${KDEPIMLIBS_TARGET_PREFIX}
DESTINATION ${_KdepimLibsConfig_INSTALL_DIR}
DESTINATION ${LIB_INSTALL_DIR}/cmake/KdepimLibs
FILE KDEPimLibsLibraryTargetsWithPrefix.cmake )
# Install a KDEPimLibsDependencies.cmake so people using kdepimlibs 4.2 with kdelibs < 4.2 get a useful error message, Alex

View file

@ -1,5 +1,4 @@
project( gpgmepp )
#KDE4_NO_ENABLE_FINAL(gpgmepp)
if (MINGW)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mms-bitfields")

View file

@ -34,7 +34,9 @@ if ( _any_gpgme_found )
include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${GPGME_INCLUDES} ${CMAKE_SOURCE_DIR}/gpgme++ ${Boost_INCLUDE_DIR} )
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()
set( qgpgme_LIB_SRCS
dataprovider.cpp

View file

@ -21,21 +21,16 @@ set(kfilereplacepart_PART_SRCS
kfilereplacelib.cpp
report.cpp
commandengine.cpp
configurationclasses.cpp )
qt4_add_dbus_adaptor( kfilereplacepart_PART_SRCS org.kde.kfilereplace.xml kfilereplacepart.h KFileReplacePart )
kde4_add_ui_files(kfilereplacepart_PART_SRCS
configurationclasses.cpp
kfilereplaceviewwdg.ui
kaddstringdlgs.ui
knewprojectdlgs.ui
koptionsdlgs.ui )
qt4_add_dbus_adaptor( kfilereplacepart_PART_SRCS org.kde.kfilereplace.xml kfilereplacepart.h KFileReplacePart )
kde4_add_plugin(kfilereplacepart WITH_PREFIX ${kfilereplacepart_PART_SRCS})
target_link_libraries(kfilereplacepart ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} )
install(TARGETS kfilereplacepart DESTINATION ${PLUGIN_INSTALL_DIR})
@ -46,7 +41,7 @@ install(TARGETS kfilereplacepart DESTINATION ${PLUGIN_INSTALL_DIR})
set(kfilereplace_SRCS kfilereplace.cpp main.cpp )
kde4_add_executable(kfilereplace ${kfilereplace_SRCS})
add_executable(kfilereplace ${kfilereplace_SRCS})
target_link_libraries(kfilereplace ${KDE4_KPARTS_LIBS} )

View file

@ -1,211 +0,0 @@
2005-02-20: Andras Mantia <amantia@kde.org>
* Added the possibility to select the encoding of the files and a warning about
the possible damaged result if the wrong encoding is chosen
2005-02-16: Andras Mantia <amantia@kde.org>
* Accept paths as command line arguments
2005-01-29 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Cleaning up.
2005-01-23 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Some clean up.
* Now the text 'captured text "blabla" at line...' etc. is substituted with
'Line:xyz, Col:abc "blabla"'
* Fixed a bug in the string view, that cause KFR to crash if the string list is empty
and the user click on it with the mouse.
2005-01-17 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Now it should be possible to handle other characters encoding, like japanese.
* Added, but still buggy, a "replace confirmation" option.
* Now when open KFilereplace as standalone application it uses
this "*.c*;*.h*;*.sh;*.txt*;*.p*;*.java;*.log" string as default filter.
2005-01-14 Andras Mantia <amantia@kde.org>
* Don't show the cannot open file dialogs for directories
* Don't create a backup for every scanned file, only for those that were modified
* Don't update the timestap for every scanned file
* Fix installation of the icons (they go to the part's data dir now)
2005-01-13 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I added some other infos to the docbook manual, I hope to complete it as soon as possible.
* I added a new command: [$mathexp:some_expression$]. It uses the bc calculator to
compute the result of an expression.
2005-01-11 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Fixed a bug in KAddStringDlg: now when we want edit a string the search-only mode and search-replace mode
don't merge.
* Modified KFR file format: I added the tag '<mode search=""/>' just after the root <kfr> to allows
kfilereplace to recognize if the list to load is a list of only search strings. I added some lines of code
to permit users to load files that don't have this new tag.
* I'm writing docbook manual.
2005-01-10 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* The KFilereplaceView widget has been modified. Now it change the layout of kfilereplace depending of the
value of m_option->m_searchOnlyMode.
* I fixed a bug in the backup file option.
2004-12-13 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I modified the way we can open files in quanta. Now we can select one or more entries
in the QListView that store the results, and open several files, at the same time.
For selecting more than one file, we must press CTRL button while clicking with mouse
on the entry we want open.
2004-11-10 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I added a graphical file counter.
* I added a semaphore to notify user about the state of the search.
* I improved a little the speed.
* I made some cleanup.
2004-09-27 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I fixed a bug that affect some strings in case of translation.
* I fixed a bug that affect "Create backup" option, I think that now this feature should work
properly.
2004-09-26 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I did some cleanup.
2004-09-11 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I added the class ResultViewEntry in configurationclasses.(h,cpp) to make the replace algorithm more clean.
* I make multiline text searching more useable.
* Now the file entries in the result view are shown with descriptive icons.
* I'm trying to write some documentation, in the meanwhile a tutorial is present.
2004-08-13 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I added CommandEngine class and Report class.
In fact I moved the code that do the report document and the
code that do commands feature from KFileREplaceLib to these two classes.
2004-08-09 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I fixed a bug that affected the method "void KFileReplaceView::slotStringsClear()" in kfilereplaceview.cpp file.
This bug caused the list of strings not to be correctly erased.
2004-08-07 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I modified the save-results system(thanks Luciano for the idea of using xml/css tecnology).
Now KFR creates a directory with name "NAME" that contains a xml file "NAME.xml"
and a css file "NAME.css". These two files are the new "report document"
that substitutes the xhtml file. To try it choose "Search/Replace|Results|Create Report File" menu option.
* I fixed a bug that causes Quanta to crash when we push Cancel button in new project
dialog.
* I finished the tutorial.
2004-08-01 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* The line "if(::access(directory.local8Bit(), R_OK | X_OK) == -1)" has been removed,
and subtitued with "QFileInfo dirInfo(directory); "
"if(not(dirInfo.isReadable() and dirInfo.isExecutable())"
" or "
" not(dirInfo.isWritable())) "
in kfilereplacepart.cpp
2004-07-30 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* The icons have been fixed!!! What a miracle!!!
2004-07-24 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I added a little feature. When KFR matches a string, it shows the row and the column
where that match is, by using a message like this:
/my/path/file
|
|__ string "xyz" found at line:40, column:2
|__ string "xyz" found at line:18, column:57
|__.............
Now if you use "Edit with Quanta" popup menu option, say, on the line:
"string "xyz" found at line:40, column:2"
of the result view, Quanta will open the file /my/path/file at row 40, column 2.
2004-07-20 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I fixed a bug that affects the generation of extension of
the backup files.
2004-07-17 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I fixed the bug that causes quanta to crash when KFR is active.
* I fixed (I hope!) the simulation feature.
* I reorganize the KOptionsDlg UI.
* I Added some tool tips.
* I' m tired and I go on bed ;-)
2004-07-16 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* The KNewProjectDlg was modified, adding quick search/replace line edit objects
* A option in KOptionDlg was added, so that the files that don't
contain the strings we are searching for, will not be shown.
* Some code clean-up
* A bug with KAddStringDlg was fixed.
* I found a bug that makes quanta to crash when we close quanta with the x button...
I'm trying to fix it.
2004-05-30 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Well, KFR has been entirely (more or less :-)) rewrote.
the files:
apistruct.h
kernel.(cpp,h)
kexpression.(cpp,h)
kfilereplacedoc.(cpp,h)
kfilereplacepref.(cpp,h)
were removed and these files are added:
configurationclasses.h
. the internal architecture was redesigned, to use QT/KDE tecnologies in particular:
. C-like code were removed (where possible).
. some system dependent functions were substituted with more portable code.
. the apistructs.h file were substituted with one class in configurationclasses.h.
. the UIs were modified in particular:
. new "add string" dialog were added.
. project dialog were modified.
. some new features were added in particular:
. the variable replace mechanism were modified.
. the result view shows the line and column where the string has been found.
. now the mechanism of search/replace with wildcards inherits from QT regular expression engine.
* I wrote a little tutorial(TUTOR.txt), but a more exhaustive tutorial will be released soon.
Note: there some bugs to fix and some feature to implement, in particular:
. Simulation is not yet implemented.
. Some options are presents but disabled.
. I want to add more KFR variable commands.
2004-03-26 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Added a feature. Now we can open a file from the result view of KFR in Quanta(thanks Andras).
2004-03-14 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Replaced two QLineEdit with two QSpinbox in knewprojectdlg.ui
* Fixed a bug in the new kfr (XML-based) file format.
2004-03-12 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Removed KresultView(.h,.cpp). Now KFileReplaceView is a QWidget that contains results and
strings view.
* Added whatthis.h that contains the "what's this" strings.
* Fixed a bug that generate a wrong XHTML result file.
2004-03-06 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* Added kconfirmdlgs.ui.
* Fixed a bug in KOptionDlg, now when we select a option, the selection is shown correctly.
* Fixed a bug KNewProjectDlg.
2004-02-26 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* I added a method 'editStrings' that fixes tha behaviour when a user
chooses edit string option instead of add string option.
* I modified the property textFormat of the QTextEdit widgets of
KAddstringDlg, from the value 'AutoText' to the value 'PlainText',
so the QTextEdit widgets will not try to render a string containing
html code.
2004-02-24 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* kfilereplacepref.(h,cpp) were removed.
* kernel.(h,cpp) now are a singleton class.
* Some macros in kernel.h were replaced with integer constants.
* Methods in kernel.h file were renamed.
* Some superflous #include lines were removed.
* The filelib.(h,cpp) were subtituted with KFilereplaceLib singleton class.
* Now kfilereplace logo and icons in the result view appear.
2004-02-18 Emiliano Gulmini <emi_barbarossa@yahoo.it>
* The icons in toolbar directory were redrawn.
* Deleted the KFRHeader struct from apistruct.h.
* The mechanism of saving the string rules has been modified: now we can save the rules in a
file like this "a_file_name.kfr" that is an XML file.
* The file containing the results of the operations is now a XHTML file.
* Two new files UI added: now KOptionDlg inherits from KOptionDlgS and KAddstringDlg inherits
from KAddstringDlgS.
* The klistviewstring.(h,cpp) were removed.
* A lot of clean up has been made in all files.

View file

@ -1,13 +1,15 @@
add_subdirectory( plugins )
add_subdirectory( searchhandlers )
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()
########### next target ###############
set(khc_indexbuilder_SRCS khc_indexbuilder.cpp )
kde4_add_executable(khc_indexbuilder NOGUI ${khc_indexbuilder_SRCS})
add_executable(khc_indexbuilder ${khc_indexbuilder_SRCS})
target_link_libraries(khc_indexbuilder ${KDE4_KDECORE_LIBS} )
@ -16,7 +18,7 @@ install(TARGETS khc_indexbuilder DESTINATION ${LIBEXEC_INSTALL_DIR})
########### next target ###############
set(khelpcenter_KDEINIT_SRCS
set(khelpcenter_SRCS
navigator.cpp
navigatoritem.cpp
navigatorappitem.cpp
@ -42,14 +44,12 @@ set(khelpcenter_KDEINIT_SRCS
scrollkeepertreebuilder.cpp
searchhandler.cpp )
qt4_add_dbus_adaptor( khelpcenter_KDEINIT_SRCS org.kde.khelpcenter.kcmhelpcenter.xml kcmhelpcenter.h KCMHelpCenter )
qt4_add_dbus_adaptor( khelpcenter_SRCS org.kde.khelpcenter.kcmhelpcenter.xml kcmhelpcenter.h KCMHelpCenter )
kde4_add_kcfg_files(khelpcenter_KDEINIT_SRCS prefs.kcfgc )
kde4_add_app_icon(khelpcenter_KDEINIT_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/help-browser.png")
kde4_add_kcfg_files(khelpcenter_SRCS prefs.kcfgc )
kde4_add_kdeinit_executable( khelpcenter ${khelpcenter_KDEINIT_SRCS})
target_link_libraries(kdeinit_khelpcenter ${KDE4_KPARTS_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KCMUTILS_LIBS} )
install(TARGETS kdeinit_khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS} )
add_executable( khelpcenter ${khelpcenter_SRCS})
target_link_libraries(khelpcenter ${KDE4_KPARTS_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KCMUTILS_LIBS} )
install(TARGETS khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############

View file

@ -228,12 +228,8 @@ signals:
sipType = sipType_KActionCategory;
else if (dynamic_cast<KActionCollection*>(sipCpp))
sipType = sipType_KActionCollection;
else if (dynamic_cast<KCategoryDrawerV2*>(sipCpp))
{
sipType = sipType_KCategoryDrawerV2;
if (dynamic_cast<KCategoryDrawerV3*>(sipCpp))
sipType = sipType_KCategoryDrawerV3;
}
else if (dynamic_cast<KCategoryDrawer*>(sipCpp))
sipType = sipType_KCategoryDrawer;
else if (dynamic_cast<KCompletion*>(sipCpp))
sipType = sipType_KCompletion;
else if (dynamic_cast<KConfigDialogManager*>(sipCpp))
@ -380,8 +376,6 @@ signals:
sipType = sipType_KUndoStack;
else if (dynamic_cast<KDateValidator*>(sipCpp))
sipType = sipType_KDateValidator;
else if (dynamic_cast<KFloatValidator*>(sipCpp))
sipType = sipType_KFloatValidator;
else if (dynamic_cast<KIntValidator*>(sipCpp))
sipType = sipType_KIntValidator;
else if (dynamic_cast<KMimeTypeValidator*>(sipCpp))

View file

@ -26,7 +26,8 @@ class KCategoryDrawer
%End
public:
KCategoryDrawer ();
KCategoryDrawer (QWidget* parent /TransferThis/ = 0);
virtual void drawCategory (const QModelIndex& index, int sortRole, const QStyleOption& option, QPainter* painter) const;
virtual int categoryHeight (const QModelIndex& index, const QStyleOption& option) const;
~KCategoryDrawer ();
@ -34,41 +35,22 @@ public:
void setLeftMargin (int leftMargin);
int rightMargin () const;
void setRightMargin (int rightMargin);
};
// KCategoryDrawer
void mouseButtonPressed (const QModelIndex& index, QMouseEvent* event);
void mouseButtonReleased (const QModelIndex& index, QMouseEvent* event);
void mouseButtonMoved (const QModelIndex& index, QMouseEvent* event);
void mouseButtonDoubleClicked (const QModelIndex& index, QMouseEvent* event);
class KCategoryDrawerV2 : QObject, KCategoryDrawer
{
%TypeHeaderCode
#include <kcategorydrawer.h>
%End
KCategorizedView* view () const;
public:
KCategoryDrawerV2 (QObject* parent /TransferThis/ = 0);
virtual ~KCategoryDrawerV2 ();
virtual void mouseButtonPressed (const QModelIndex& index, QMouseEvent* event);
virtual void mouseButtonReleased (const QModelIndex& index, QMouseEvent* event);
virtual void mouseButtonMoved (const QModelIndex& index, QMouseEvent* event);
virtual void mouseButtonDoubleClicked (const QModelIndex& index, QMouseEvent* event);
signals:
void collapseOrExpandClicked (const QModelIndex& index);
void actionRequested (int action, const QModelIndex& index);
};
class KCategoryDrawerV3 : KCategoryDrawerV2
{
%TypeHeaderCode
#include <kcategorydrawer.h>
%End
public:
KCategoryDrawerV3 (KCategorizedView* view);
virtual ~KCategoryDrawerV3 ();
KCategorizedView* view () const;
protected:
virtual void mouseButtonPressed (const QModelIndex& index, const QRect& blockRect, QMouseEvent* event);
virtual void mouseButtonReleased (const QModelIndex& index, const QRect& blockRect, QMouseEvent* event);
virtual void mouseMoved (const QModelIndex& index, const QRect& blockRect, QMouseEvent* event);
virtual void mouseButtonDoubleClicked (const QModelIndex& index, const QRect& blockRect, QMouseEvent* event);
virtual void mouseLeft (const QModelIndex& index, const QRect& blockRect);
void mouseButtonPressed (const QModelIndex& index, const QRect& blockRect, QMouseEvent* event);
void mouseButtonReleased (const QModelIndex& index, const QRect& blockRect, QMouseEvent* event);
void mouseMoved (const QModelIndex& index, const QRect& blockRect, QMouseEvent* event);
void mouseButtonDoubleClicked (const QModelIndex& index, const QRect& blockRect, QMouseEvent* event);
void mouseLeft (const QModelIndex& index, const QRect& blockRect);
};

View file

@ -44,31 +44,6 @@ public:
// KIntValidator
class KFloatValidator : QValidator
{
%TypeHeaderCode
#include <knumvalidator.h>
%End
public:
explicit KFloatValidator (QWidget* parent /TransferThis/);
KFloatValidator (double bottom, double top, QWidget* parent /TransferThis/);
KFloatValidator (double bottom, double top, bool localeAware, QWidget* parent /TransferThis/);
virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /;
virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/;
virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /;
virtual void fixup(QString & /Constrained/) const /API=QString: - 2/;
virtual void setRange (double bottom, double top);
virtual double bottom () const;
virtual double top () const;
void setAcceptLocalizedNumbers (bool b);
bool acceptLocalizedNumbers () const;
~KFloatValidator ();
};
// KFloatValidator
class KDoubleValidator : QDoubleValidator
{
%TypeHeaderCode

View file

@ -238,12 +238,8 @@ protected:
sipType = sipType_KActionCategory;
else if (dynamic_cast<KActionCollection*>(sipCpp))
sipType = sipType_KActionCollection;
else if (dynamic_cast<KCategoryDrawerV2*>(sipCpp))
{
sipType = sipType_KCategoryDrawerV2;
if (dynamic_cast<KCategoryDrawerV3*>(sipCpp))
sipType = sipType_KCategoryDrawerV3;
}
else if (dynamic_cast<KCategoryDrawer*>(sipCpp))
sipType = sipType_KCategoryDrawer;
else if (dynamic_cast<KCompletion*>(sipCpp))
sipType = sipType_KCompletion;
else if (dynamic_cast<KConfigDialogManager*>(sipCpp))
@ -390,8 +386,6 @@ protected:
sipType = sipType_KUndoStack;
else if (dynamic_cast<KDateValidator*>(sipCpp))
sipType = sipType_KDateValidator;
else if (dynamic_cast<KFloatValidator*>(sipCpp))
sipType = sipType_KFloatValidator;
else if (dynamic_cast<KIntValidator*>(sipCpp))
sipType = sipType_KIntValidator;
else if (dynamic_cast<KMimeTypeValidator*>(sipCpp))

View file

@ -38,7 +38,6 @@ public:
QString tabText (int) const;
void setTabText (int, const QString&);
virtual void moveTab (int, int);
virtual void removePage (QWidget* w);
virtual void removeTab (int index);
void setAutomaticResizeTabs (bool enable);

View file

@ -105,7 +105,6 @@ signals:
protected:
public:
~Wallet ();
static bool isUsingKSecretsService ();
};
// Wallet

View file

@ -24,12 +24,10 @@
%Import QtGui/QtGuimod.sip
%Include terminal_interface.sip
%Include terminal_interface_v2.sip
%ModuleHeaderCode
#pragma GCC visibility push(default)
#include <kde_terminal_interface.h>
#include <kde_terminal_interface_v2.h>
#include <kparts/part.h>
/**
@ -50,7 +48,6 @@ public:
*/
KTerminal(KParts::Part* part): m_part(part) {}
TerminalInterface* terminalInterface() { return qobject_cast<TerminalInterface*>(m_part); }
TerminalInterfaceV2* terminalInterfaceV2() { return qobject_cast<TerminalInterfaceV2*>(m_part); }
protected:
KParts::Part *m_part;
};
@ -60,12 +57,25 @@ class KTerminal
{
%TypeHeaderCode
#include <kde_terminal_interface.h>
#include <kde_terminal_interface_v2.h>
#include <kparts/part.h>
%End
public:
KTerminal(KParts::Part* part);
TerminalInterface* terminalInterface();
TerminalInterfaceV2* terminalInterfaceV2();
/**
* Return terminal PID
*/
virtual int terminalProcessId() = 0;
/**
* Return foregound PID, If there is no foreground process running, returns -1
*/
virtual int foregroundProcessId() = 0;
/**
* Returns sub process name. If there is no sub process running, returns empty QString
*/
virtual QString foregroundProcessName() = 0;
};

View file

@ -1,45 +0,0 @@
%Copying
Copyright (c) 2011 Shaheed Haque (srhaque@theiet.org)
This file is part of PyKDE4.
PyKDE4 is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of
the License, or (at your option) any later version.
PyKDE4 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http:www.gnu.org/licenses/>.
%End
class TerminalInterfaceV2: TerminalInterface
{
%TypeHeaderCode
#include <kde_terminal_interface_v2.h>
%End
public:
virtual ~TerminalInterfaceV2();
/**
* Return terminal PID
*/
virtual int terminalProcessId() = 0;
/**
* Return foregound PID, If there is no foreground process running, returns -1
*/
virtual int foregroundProcessId() = 0;
/**
* Returns sub process name. If there is no sub process running, returns empty QString
*/
virtual QString foregroundProcessName() = 0;
};