[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/korganizer
From: Volker Krause <vkrause () kde ! org>
Date: 2010-09-29 8:19:56
Message-ID: 20100929081957.22792AC88E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1180844 by vkrause:
KOrganizer is finally Qt3Support free :)
M +1 -12 CMakeLists.txt
M +1 -1 actionmanager.cpp
M +2 -0 korgac/korgacmain.cpp
M +3 -3 printing/calprintdefaultplugins.cpp
M +16 -16 printing/calprintpluginbase.cpp
M +1 -0 views/timespentview/kotimespentview.cpp
--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #1180843:1180844
@@ -24,9 +24,7 @@
# enable exception handling
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
-if (QT_QT3SUPPORT_FOUND)
add_subdirectory( tests )
-endif (QT_QT3SUPPORT_FOUND)
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5850)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
@@ -43,16 +41,12 @@
${Boost_INCLUDE_DIRS}
${QT_INCLUDES} ${ZLIB_INCLUDE_DIR} )
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
add_subdirectory( interfaces )
add_subdirectory( korgac )
add_subdirectory( pixmaps )
add_subdirectory( sounds )
-if (QT_QT3SUPPORT_FOUND)
add_subdirectory( plugins )
add_subdirectory( kcmconfigs )
-endif (QT_QT3SUPPORT_FOUND)
set( PERL ${PERL_EXECUTABLE} )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ical2vcal.cmake \
${CMAKE_CURRENT_BINARY_DIR}/ical2vcal @ONLY) @@ -60,7 +54,6 @@
########### next target ###############
-if (QT_QT3SUPPORT_FOUND)
set(korganizer_SRCS
main.cpp
korganizer.cpp
@@ -73,7 +66,6 @@
target_link_libraries(korganizer
${KDE4_KDEUI_LIBS}
- ${KDE4_KDE3SUPPORT_LIBRARY}
${KDE4_KPARTS_LIBRARY}
${KDEPIMLIBS_KHOLIDAYS_LIBS}
${KDEPIMLIBS_KONTACTINTERFACE_LIBS}
@@ -118,7 +110,6 @@
target_link_libraries(korganizerpart ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} \
${KDEPIMLIBS_AKONADI_LIBS} korganizer_interfaces calendarsupport korganizer_core \
korganizerprivate ${KDEPIMLIBS_KCALCORE_LIBS} ${KDEPIMLIBS_KCALUTILS_LIBS} )
install(TARGETS korganizerpart DESTINATION ${PLUGIN_INSTALL_DIR})
-endif (QT_QT3SUPPORT_FOUND)
########### next target ###############
@@ -146,7 +137,6 @@
########### next target ###############
-if (QT_QT3SUPPORT_FOUND)
set(korganizerprivate_LIB_SRCS
kocollectionpropertiesdialog.cpp
collectiongeneralpage.cpp
@@ -223,7 +213,7 @@
kde4_add_library(korganizerprivate ${LIBRARY_TYPE} ${korganizerprivate_LIB_SRCS})
target_link_libraries(korganizerprivate
- ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KCMUTILS_LIBS} \
${KDE4_KPRINTUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${ZLIB_LIBRARY} + \
${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KCMUTILS_LIBS} \
${KDE4_KPRINTUTILS_LIBS} ${ZLIB_LIBRARY} ${KDEPIMLIBS_KABC_LIBS} \
${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_KMIME_LIBS} \
${KDEPIMLIBS_KHOLIDAYS_LIBS} ${KDEPIMLIBS_AKONADI_LIBS}
@@ -245,7 +235,6 @@
set_target_properties(korganizerprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS korganizerprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY \
NAMELINK_SKIP)
-endif (QT_QT3SUPPORT_FOUND)
########### install files ###############
--- trunk/KDE/kdepim/korganizer/actionmanager.cpp #1180843:1180844
@@ -1818,7 +1818,7 @@
case KOPrefs::InlineBody:
{
QFile f( file );
- if ( !f.open( IO_ReadOnly ) ) {
+ if ( !f.open( QFile::ReadOnly ) ) {
return;
}
KMime::Message *msg = new KMime::Message();
--- trunk/KDE/kdepim/korganizer/korgac/korgacmain.cpp #1180843:1180844
@@ -28,6 +28,8 @@
#include <KCmdLineArgs>
#include <KUniqueApplication>
+#include <stdlib.h>
+
class ReminderDaemonApp : public KUniqueApplication
{
public:
--- trunk/KDE/kdepim/korganizer/printing/calprintdefaultplugins.cpp #1180843:1180844
@@ -215,12 +215,12 @@
QFont oldFont( p.font() );
p.setFont( captionFont );
- p.drawText( box, Qt::AlignLeft|Qt::AlignTop|Qt::SingleLine, caption );
+ p.drawText( box, Qt::AlignLeft|Qt::AlignTop|Qt::TextSingleLine, caption );
if ( !text.isEmpty() ) {
textRect.setLeft( textRect.left() + textWd );
p.setFont( textFont );
- p.drawText( textRect, Qt::AlignLeft|Qt::AlignTop|Qt::SingleLine, text );
+ p.drawText( textRect, Qt::AlignLeft|Qt::AlignTop|Qt::TextSingleLine, text );
}
p.setFont( oldFont );
return textRect.bottom();
@@ -872,7 +872,7 @@
BOX_BORDER_WIDTH,
QRect( 0, headerBox.bottom() + padding(), TIMELINE_WIDTH, \
allDayHeight ), i18n( "Today's Events" ),
- Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak );
+ Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap );
p.setFont( oldFont );
// now draw at most maxAllDayEvents in the all-day box
--- trunk/KDE/kdepim/korganizer/printing/calprintpluginbase.cpp #1180843:1180844
@@ -402,7 +402,7 @@
QRect newbox( box );
newbox.adjust( 3, 1, -1, -1 );
p.drawText( newbox, ( flags == -1 ) ?
- ( Qt::AlignTop | Qt::AlignJustify | Qt::BreakAnywhere ) : flags, str \
); + ( Qt::AlignTop | Qt::AlignJustify | Qt::TextWrapAnywhere ) : flags, \
str ); }
void CalPrintPluginBase::showEventBox( QPainter &p, int linewidth, const QRect &box,
@@ -442,7 +442,7 @@
p.rotate( -90 );
QRect rotatedBox( -box.top() - box.height(), box.left(), box.height(), box.width() \
); showEventBox( p, linewidth, rotatedBox, Incidence::Ptr(), str,
- ( flags == -1 ) ? Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine \
: flags ); + ( flags == -1 ) ? Qt::AlignLeft | Qt::AlignVCenter | \
Qt::TextSingleLine : flags );
p.restore();
}
@@ -471,7 +471,7 @@
QRect captionBox( box.left() + padding(), box.top() + padding(), 0, 0 );
p.setFont( captionFont );
captionBox = p.boundingRect( captionBox,
- Qt::AlignLeft | Qt::AlignTop | Qt::SingleLine,
+ Qt::AlignLeft | Qt::AlignTop | Qt::TextSingleLine,
caption );
p.setFont( oldFont );
if ( captionBox.right() > box.right() ) {
@@ -493,14 +493,14 @@
}
drawBox( p, BOX_BORDER_WIDTH, box );
p.setFont( captionFont );
- p.drawText( captionBox, Qt::AlignLeft | Qt::AlignTop | Qt::SingleLine,
+ p.drawText( captionBox, Qt::AlignLeft | Qt::AlignTop | Qt::TextSingleLine,
caption );
if ( !contents.isEmpty() ) {
if ( sameLine ) {
QString contentText = toPlainText( contents );
p.setFont( textFont );
- p.drawText( textBox, Qt::AlignLeft | Qt::AlignTop | Qt::SingleLine,
+ p.drawText( textBox, Qt::AlignLeft | Qt::AlignTop | Qt::TextSingleLine,
contents );
} else {
QTextDocument rtb;
@@ -552,7 +552,7 @@
if ( expand ) {
p.setFont( newFont );
QRect boundingR =
- p.boundingRect( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak, \
title ); + p.boundingRect( textRect, Qt::AlignLeft | Qt::AlignVCenter | \
Qt::TextWordWrap, title ); p.setFont( oldFont );
int h = boundingR.height();
if ( h > allbox.height() ) {
@@ -585,7 +585,7 @@
// Set the margins
p.setFont( newFont );
textRect.adjust( 5, 0, 0, 0 );
- p.drawText( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak, title );
+ p.drawText( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextWordWrap, title \
); p.setFont( oldFont );
#endif
// prev month left, current month centered, next month right
@@ -603,7 +603,7 @@
// Set the margins
p.setFont( newFont );
- p.drawText( textRect, Qt::AlignCenter | Qt::AlignVCenter | Qt::WordBreak, title );
+ p.drawText( textRect, Qt::AlignCenter | Qt::AlignVCenter | Qt::TextWordWrap, title \
); p.setFont( oldFont );
return textRect.bottom();
@@ -616,7 +616,7 @@
QFontMetrics fm( p.font() );
QString dateStr =
KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(), \
KLocale::LongDate );
- p.drawText( footbox, Qt::AlignCenter | Qt::AlignVCenter | Qt::SingleLine,
+ p.drawText( footbox, Qt::AlignCenter | Qt::AlignVCenter | Qt::TextSingleLine,
i18nc( "print date: formatted-datetime", "printed: %1", dateStr ) );
p.setFont( oldfont );
@@ -1468,7 +1468,7 @@
QRect dateBox( dayBox );
dateBox.setWidth( dayNrWidth + 3 );
p.drawText( dateBox,
- Qt::AlignRight | Qt::AlignVCenter | Qt::SingleLine,
+ Qt::AlignRight | Qt::AlignVCenter | Qt::TextSingleLine,
QString::number( d + 1 ) );
}
p.setBrush( oldbrush );
@@ -1614,7 +1614,7 @@
QRect dayBox( xstartcont, daysBox.top() + qRound( dayheight * d ), 0, 0 );
dayBox.setRight( box.right() );
dayBox.setBottom( daysBox.top() + qRound( dayheight * ( d + 1 ) ) );
- printEventString( p, dayBox, txt, Qt::AlignTop | Qt::AlignLeft | \
Qt::BreakAnywhere ); + printEventString( p, dayBox, txt, Qt::AlignTop | \
Qt::AlignLeft | Qt::TextWrapAnywhere ); }
p.setFont( oldfont );
drawBox( p, BOX_BORDER_WIDTH, borderBox );
@@ -1830,7 +1830,7 @@
// summary
outStr = todo->summary();
rect = p.boundingRect( lhs, rect.top(), ( rhs - ( left + rect.width() + 5 ) ),
- -1, Qt::WordBreak, outStr );
+ -1, Qt::TextWordWrap, outStr );
QRect newrect;
QFont newFont( p.font() );
@@ -1839,7 +1839,7 @@
newFont.setStrikeOut( true );
p.setFont( newFont );
}
- p.drawText( rect, Qt::WordBreak, outStr, &newrect );
+ p.drawText( rect, Qt::TextWordWrap, outStr, &newrect );
p.setFont( oldFont );
// due date
if ( todo->hasDueDate() && posDueDt >= 0 ) {
@@ -2002,15 +2002,15 @@
headerText = i18nc( "Description - date", "%1 - %2", journal->summary(), \
dateText ); }
- QRect rect( p.boundingRect( x, y, width, -1, Qt::WordBreak, headerText ) );
+ QRect rect( p.boundingRect( x, y, width, -1, Qt::TextWordWrap, headerText ) );
if ( rect.bottom() > pageHeight ) {
// Start new page...
y = 0;
mPrinter->newPage();
- rect = p.boundingRect( x, y, width, -1, Qt::WordBreak, headerText );
+ rect = p.boundingRect( x, y, width, -1, Qt::TextWordWrap, headerText );
}
QRect newrect;
- p.drawText( rect, Qt::WordBreak, headerText, &newrect );
+ p.drawText( rect, Qt::TextWordWrap, headerText, &newrect );
p.setFont( oldFont );
y = newrect.bottom() + 4;
--- trunk/KDE/kdepim/korganizer/views/timespentview/kotimespentview.cpp \
#1180843:1180844 @@ -38,6 +38,7 @@
#include <QBoxLayout>
#include <QPainter>
#include <QPainterPath>
+#include <QPaintEvent>
using namespace KCalCore;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic