From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/printing/calprintdayconfig_base.ui | 10 +++++----- korganizer/printing/calprintdefaultplugins.cpp | 2 +- korganizer/printing/calprinter.cpp | 10 +++++----- .../printing/calprintincidenceconfig_base.ui | 6 +++--- korganizer/printing/calprintmonthconfig_base.ui | 8 ++++---- korganizer/printing/calprintpluginbase.cpp | 22 +++++++++++----------- korganizer/printing/calprintpluginbase.h | 6 +++--- korganizer/printing/calprinttodoconfig_base.ui | 16 ++++++++-------- korganizer/printing/calprintweekconfig_base.ui | 14 +++++++------- 9 files changed, 47 insertions(+), 47 deletions(-) (limited to 'korganizer/printing') diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index 8abfaa1c..bb1bfc0b 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -6,7 +6,7 @@ CalPrintDay_Base - + 0 0 @@ -56,7 +56,7 @@ Expanding - + 121 21 @@ -73,7 +73,7 @@ Expanding - + 121 21 @@ -228,7 +228,7 @@ Expanding - + 21 201 @@ -249,7 +249,7 @@ kdateedit.h - + libkdepim/kdateedit.h libkdepim/kdateedit.h diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index 8c2539e8..b62c7add 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -52,7 +52,7 @@ static TQString cleanString( const TQString &instr ) { TQString ret = instr; - return ret.replace( '\n', ' ' ); + return ret.tqreplace( '\n', ' ' ); } /************************************************************** diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index 0ab61fda..0517dec0 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -178,7 +178,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" ); // use the minimal width possible = max width of the radio buttons, not extensible -/* mTypeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, +/* mTypeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, mTypeGroup->sizePolicy().hasHeightForWidth() ) );*/ @@ -220,11 +220,11 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, TQRadioButton *radioButton = new TQRadioButton( p->description(), mTypeGroup ); radioButton->setEnabled( p->enabled() ); mTypeGroup->insert( radioButton, mapit.key() ); -// radioButton->setMinimumHeight( radioButton->sizeHint().height() - 5 ); +// radioButton->setMinimumHeight( radioButton->tqsizeHint().height() - 5 ); } - setMinimumSize( minimumSizeHint() ); - resize( minimumSizeHint() ); + setMinimumSize( tqminimumSizeHint() ); + resize( tqminimumSizeHint() ); } CalPrintDialog::~CalPrintDialog() @@ -255,7 +255,7 @@ void CalPrintDialog::setOrientation( CalPrinter::ePrintOrientation orientation ) KOrg::PrintPlugin *CalPrintDialog::selectedPlugin() { int id = mTypeGroup->selectedId(); - if ( mPluginIDs.contains( id ) ) { + if ( mPluginIDs.tqcontains( id ) ) { return mPluginIDs[id]; } else { return 0; diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui index 5a85fb71..ef238b52 100644 --- a/korganizer/printing/calprintincidenceconfig_base.ui +++ b/korganizer/printing/calprintincidenceconfig_base.ui @@ -6,7 +6,7 @@ CalPrintIncidence_Base - + 0 0 @@ -90,7 +90,7 @@ Expanding - + 21 201 @@ -99,5 +99,5 @@ - + diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui index 00172958..6fd311ea 100644 --- a/korganizer/printing/calprintmonthconfig_base.ui +++ b/korganizer/printing/calprintmonthconfig_base.ui @@ -6,7 +6,7 @@ CalPrintMonth_Base - + 0 0 @@ -31,7 +31,7 @@ Expanding - + 21 20 @@ -131,7 +131,7 @@ Expanding - + 17 21 @@ -200,7 +200,7 @@ kdateedit.h - + kcombobox.h knuminput.h diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index e16e72c6..c0e61b92 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -46,7 +46,7 @@ inline int round(const double x) static TQString cleanStr( const TQString &instr ) { TQString ret = instr; - return ret.replace( '\n', ' ' ); + return ret.tqreplace( '\n', ' ' ); } /****************************************************************** @@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase() TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w ) { TQFrame *wdg = new TQFrame( w ); - TQVBoxLayout *layout = new TQVBoxLayout( wdg ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg ); TQLabel *title = new TQLabel( description(), wdg ); TQFont titleFont( title->font() ); @@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w ) titleFont.setBold( true ); title->setFont( titleFont ); - layout->addWidget( title ); - layout->addWidget( new TQLabel( info(), wdg ) ); - layout->addSpacing( 20 ); - layout->addWidget( new TQLabel( i18n("This printing style does not " + tqlayout->addWidget( title ); + tqlayout->addWidget( new TQLabel( info(), wdg ) ); + tqlayout->addSpacing( 20 ); + tqlayout->addWidget( new TQLabel( i18n("This printing style does not " "have any configuration options."), wdg ) ); - layout->addStretch(); + tqlayout->addStretch(); return wdg; } @@ -182,7 +182,7 @@ void CalPrintPluginBase::doLoadConfig() if ( mConfig ) { KConfigGroupSaver saver( mConfig, description() ); mConfig->sync(); - TQDateTime currDate( TQDate::currentDate() ); + TQDateTime currDate( TQDate::tqcurrentDate() ); mFromDate = mConfig->readDateTimeEntry( "FromDate", &currDate ).date(); mToDate = mConfig->readDateTimeEntry( "ToDate" ).date(); mUseColors = mConfig->readBoolEntry( "UseColors", true ); @@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox ) TQFont oldfont( p.font() ); p.setFont( TQFont( "sans-serif", 6 ) ); TQFontMetrics fm( p.font() ); - TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); + TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine, i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) ); p.setFont( oldfont ); @@ -1602,7 +1602,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, // The problem is that relations() does not apply filters, so // we need to compare manually with the complete filtered list! Todo* subtodo = dynamic_cast( *it ); - if (subtodo && todoList.contains( subtodo ) ) { + if (subtodo && todoList.tqcontains( subtodo ) ) { drawTodo( count, subtodo, p, connectSubTodos, strikeoutCompleted, desc, posPriority, posSummary, posDueDt, posPercentComplete, level+1, x, y, width, pageHeight, todoList, &startpt ); @@ -1619,7 +1619,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, // The problem is that relations() does not apply filters, so // we need to compare manually with the complete filtered list! Todo* subtodo = dynamic_cast( *it ); - if ( subtodo && todoList.contains( subtodo ) ) { + if ( subtodo && todoList.tqcontains( subtodo ) ) { t.append( subtodo ); } } diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index b845b379..16a1cc2f 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -259,7 +259,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin It prints the given text and optionally one or two small month views, as specified by the two TQDate. The printed text can also contain a line feed. - If month2 is invalid, only the month that contains month1 + If month2 is invalid, only the month that tqcontains month1 is printed. E.g. the filofax week view draws just the current month, while the month view draws the previous and the next month. @@ -419,7 +419,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin On the left side the time scale is printed (using drawTimeLine), then each day gets one column (printed using drawAgendaDayBox), and the events are displayed as boxes (like in korganizer's day/week view). - The first cell of each column contains the all-day events (using + The first cell of each column tqcontains the all-day events (using drawAllDayBox with expandable=false). The given time range cannot be expanded to include all events. \param p TQPainter of the printout @@ -435,7 +435,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin /** Draw the month table of the month containing the date qd. Each day gets one - box (using drawDayBox) that contains a list of all events on that day. They are arranged + box (using drawDayBox) that tqcontains a list of all events on that day. They are arranged in a matrix, with the first column being the first day of the week (so it might display some days of the previous and the next month). Above the matrix there is a bar showing the weekdays (drawn using drawDaysOfWeek). diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index 53fd3bfb..ea2dcff2 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -6,7 +6,7 @@ CalPrintTodoConfig_Base - + 0 0 @@ -86,7 +86,7 @@ - layout2 + tqlayout2 @@ -102,7 +102,7 @@ Fixed - + 16 20 @@ -191,7 +191,7 @@ Expanding - + 16 21 @@ -275,7 +275,7 @@ Expanding - + 20 16 @@ -341,7 +341,7 @@ Expanding - + 121 20 @@ -358,7 +358,7 @@ Expanding - + 121 20 @@ -447,7 +447,7 @@ kdateedit.h - + libkdepim/kdateedit.h libkdepim/kdateedit.h diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui index a14013ce..32ea6fb4 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweekconfig_base.ui @@ -6,7 +6,7 @@ CalPrintWeek_Base - + 0 0 @@ -34,7 +34,7 @@ Expanding - + 21 27 @@ -62,7 +62,7 @@ Expanding - + 16 21 @@ -118,7 +118,7 @@ Expanding - + 110 20 @@ -246,7 +246,7 @@ Print as &timetable view - This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>. + This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check <i>Use Colors</i>. @@ -257,7 +257,7 @@ Print as split week view - This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait. + This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait. @@ -292,7 +292,7 @@ kdateedit.h - + libkdepim/kdateedit.h libkdepim/kdateedit.h -- cgit v1.2.3