summaryrefslogtreecommitdiffstats
path: root/kpresenter
diff options
context:
space:
mode:
Diffstat (limited to 'kpresenter')
-rw-r--r--kpresenter/KPrBackground.cpp2
-rw-r--r--kpresenter/KPrCanvas.cpp14
-rw-r--r--kpresenter/KPrDocumentIface.cpp8
-rw-r--r--kpresenter/KPrMSPresentationSetup.cpp28
-rw-r--r--kpresenter/KPrObject.cpp4
-rw-r--r--kpresenter/KPrPageIface.cpp6
-rw-r--r--kpresenter/KPrTextObjectIface.cpp2
-rw-r--r--kpresenter/KPrView.cpp6
-rw-r--r--kpresenter/KPrWebPresentation.cpp12
-rw-r--r--kpresenter/TODO2
10 files changed, 42 insertions, 42 deletions
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index a3fdbedc..91f01c7a 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -524,7 +524,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T
double w = _origSize.width();
w *= ext.width();
#if KDE_IS_VERSION(3,1,90)
- TQRect desk = TDEGlobalSettings::desktopGeometry(kapp->activeWindow());
+ TQRect desk = TDEGlobalSettings::desktopGeometry(tdeApp->activeWindow());
#else
TQRect desk = TQApplication::desktop()->screenGeometry();
#endif
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index ab8e1543..8afa94d1 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -3045,7 +3045,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
TQPainter p;
p.begin( this );
drawBackground( &p,
- TQRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() ),
+ TQRect( 0, 0, tdeApp->desktop()->width(), tdeApp->desktop()->height() ),
doc->pageList().at( m_step.m_pageNumber ) );
p.end();
}
@@ -3397,7 +3397,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted )
m_effectHandler = 0;
}
- TQPixmap screen_orig( kapp->desktop()->width(), kapp->desktop()->height() );
+ TQPixmap screen_orig( tdeApp->desktop()->width(), tdeApp->desktop()->height() );
KPrPage *page = m_view->kPresenterDoc()->pageList().at( m_step.m_pageNumber );
// YABADABADOOOOOOO.... That's a hack :-)
@@ -3406,7 +3406,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted )
//kdDebug(33001) << "Page::doObjEffects - in the strange hack" << endl;
TQPainter p;
p.begin( &screen_orig );
- TQRect desktopRect = TQRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() );
+ TQRect desktopRect = TQRect( 0, 0, tdeApp->desktop()->width(), tdeApp->desktop()->height() );
drawBackground( &p, desktopRect, page );
PresStep step( m_step.m_pageNumber, m_step.m_step, m_step.m_subStep, true, true );
drawPresPage( &p, desktopRect ,step );
@@ -3545,7 +3545,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
int i = 0;
repaint( false );
- kapp->processEvents();
+ tdeApp->processEvents();
editMode = false;
fillBlack = false;
@@ -3582,7 +3582,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
{
i=(*it);
progress.setProgress( ++j );
- kapp->processEvents();
+ tdeApp->processEvents();
if ( progress.wasCancelled() )
break;
@@ -3599,10 +3599,10 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
painter->fillRect( m_view->kPresenterDoc()->pageList().at( m_step.m_pageNumber )->getZoomPageRect(), white );
printPage( painter, step, printer, rows, cols );
- kapp->processEvents();
+ tdeApp->processEvents();
painter->resetXForm();
- kapp->processEvents();
+ tdeApp->processEvents();
current_slide += slides_per_page;
diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp
index c2c34b5d..b62f43e7 100644
--- a/kpresenter/KPrDocumentIface.cpp
+++ b/kpresenter/KPrDocumentIface.cpp
@@ -44,13 +44,13 @@ DCOPRef KPrDocumentIface::page( int num )
{
if( num>= (int )doc->getPageNums())
return DCOPRef();
- return DCOPRef( kapp->dcopClient()->appId(),
+ return DCOPRef( tdeApp->dcopClient()->appId(),
doc->pageList().at( num )->dcopObject()->objId() );
}
DCOPRef KPrDocumentIface::masterPage()
{
- return DCOPRef( kapp->dcopClient()->appId(),
+ return DCOPRef( tdeApp->dcopClient()->appId(),
doc->masterPage()->dcopObject()->objId() );
}
@@ -204,7 +204,7 @@ bool KPrDocumentIface::isSlideSelected( int pgNum)
DCOPRef KPrDocumentIface::header()
{
if(doc->header())
- return DCOPRef( kapp->dcopClient()->appId(),
+ return DCOPRef( tdeApp->dcopClient()->appId(),
doc->header()->dcopObject()->objId() );
else
return DCOPRef();
@@ -214,7 +214,7 @@ DCOPRef KPrDocumentIface::header()
DCOPRef KPrDocumentIface::footer()
{
if(doc->footer())
- return DCOPRef( kapp->dcopClient()->appId(),
+ return DCOPRef( tdeApp->dcopClient()->appId(),
doc->footer()->dcopObject()->objId() );
else
return DCOPRef();
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index 0436a7f3..c5aa7f9f 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -87,7 +87,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
for (int dirNum = 101; dirNum < 999; dirNum++) {
slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum);
@@ -97,13 +97,13 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
str = ( path + slidePath );
TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
// now do the SPP file directory
str = ( path + "/MSSONY" );
@@ -111,14 +111,14 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
str = ( path + "/MSSONY/PJ" );
TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
// create the title slides
TQPixmap titleSlide( 1024, 768 );
@@ -133,7 +133,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
// and put the specified title string on the first slide
TQFont textFont( "SansSerif", 96 );
@@ -148,7 +148,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
}
@@ -171,7 +171,7 @@ void KPrMSPresentation::createSlidesPictures( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
}
}
@@ -186,7 +186,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
sppStream.setByteOrder(TQDataStream::LittleEndian);
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
// We are doing little endian
sppStream << (TQ_UINT32)0x00505053; // SPP magic header
@@ -210,7 +210,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
sppStream << (TQ_UINT32)0x00000000; // more nulls
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
// title 1, 16 bytes null padded
strncpy( buff, "SPJT0001.JPG", 15 );
@@ -239,7 +239,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
}
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
// Add in the slide filenames
TQString filename;
@@ -250,7 +250,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
sppStream.writeRawBytes( buff, 64 );
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
}
// OK, now we need to fill to 16384 bytes
@@ -262,7 +262,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
sppFile.close();
TDEIO::NetAccess::file_move( sppFile.name(), filenameStore, -1, true /*overwrite*/);
@@ -420,7 +420,7 @@ void KPrMSPresentationSetup::showColourGroup(bool on)
void KPrMSPresentationSetup::helpMe()
{
- kapp->invokeHelp("ms-export");
+ tdeApp->invokeHelp("ms-export");
}
void KPrMSPresentationSetup::finish()
diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp
index f310552d..210506e7 100644
--- a/kpresenter/KPrObject.cpp
+++ b/kpresenter/KPrObject.cpp
@@ -1408,7 +1408,7 @@ void KPrObject::paintSelection( TQPainter *_painter, KoTextZoomHandler *_zoomHan
_painter->save();
_painter->translate( _zoomHandler->zoomItX(orig.x()), _zoomHandler->zoomItY(orig.y()) );
_painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) );
- _painter->setBrush( kapp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
+ _painter->setBrush( tdeApp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
KoRect r = getRealRect();
@@ -1444,7 +1444,7 @@ void KPrObject::paintSelection( TQPainter *_painter, KoTextZoomHandler *_zoomHan
zX6=zX6-2;
zY6=zY6-2;
- TQBrush brush=kapp->palette().color( TQPalette::Active,TQColorGroup::Base );
+ TQBrush brush=tdeApp->palette().color( TQPalette::Active,TQColorGroup::Base );
_painter->fillRect( x, y, zX6, zY6, brush );
_painter->fillRect( x, y + h / 2, zX6, zY6, brush);
_painter->fillRect( x, y + h, zX6, zY6, brush );
diff --git a/kpresenter/KPrPageIface.cpp b/kpresenter/KPrPageIface.cpp
index b0ef3b28..ced48f27 100644
--- a/kpresenter/KPrPageIface.cpp
+++ b/kpresenter/KPrPageIface.cpp
@@ -45,7 +45,7 @@ DCOPRef KPrPageIface::textObject( int num )
{
KPrTextObject * textObj=m_page->textFrameSet(num);
if(textObj)
- return DCOPRef( kapp->dcopClient()->appId(),
+ return DCOPRef( tdeApp->dcopClient()->appId(),
textObj->dcopObject()->objId() );
return DCOPRef();
}
@@ -55,7 +55,7 @@ DCOPRef KPrPageIface::selectedObject( )
{
KPrObject * obj=m_page->getSelectedObj();
if(obj)
- return DCOPRef( kapp->dcopClient()->appId(),
+ return DCOPRef( tdeApp->dcopClient()->appId(),
obj->dcopObject()->objId() );
return DCOPRef();
}
@@ -70,7 +70,7 @@ DCOPRef KPrPageIface::object( int num )
{
if( num >= (int)m_page->objNums())
return DCOPRef();
- return DCOPRef( kapp->dcopClient()->appId(),
+ return DCOPRef( tdeApp->dcopClient()->appId(),
m_page->getObject(num)->dcopObject()->objId() );
}
diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp
index e737aec9..41b96307 100644
--- a/kpresenter/KPrTextObjectIface.cpp
+++ b/kpresenter/KPrTextObjectIface.cpp
@@ -40,7 +40,7 @@ DCOPRef KPrTextObjectIface::startEditing()
KPrDocument *doc=m_textobject->kPresenterDocument();
KPrView *view=doc->firstView();
view->getCanvas()->createEditing( m_textobject);
- return DCOPRef( kapp->dcopClient()->appId(),
+ return DCOPRef( tdeApp->dcopClient()->appId(),
view->getCanvas()->currentTextObjectView()->dcopObject()->objId() );
}
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 58524853..f9e255d9 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -1518,7 +1518,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
TQCString replyType;
m_screenSaverWasEnabled = false;
// is screensaver enabled?
- if (kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "isEnabled()", data, replyType, replyData)
+ if (tdeApp->dcopClient()->call("kdesktop", "KScreensaverIface", "isEnabled()", data, replyType, replyData)
&& replyType=="bool")
{
TQDataStream replyArg(replyData, IO_ReadOnly);
@@ -1529,7 +1529,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
// disable screensaver
TQDataStream arg(data, IO_WriteOnly);
arg << false;
- if (!kapp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
+ if (!tdeApp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
kdWarning(33001) << "Couldn't disable screensaver (using dcop to kdesktop)!" << endl;
else
kdDebug(33001) << "Screensaver successfully disabled" << endl;
@@ -1643,7 +1643,7 @@ void KPrView::screenStop()
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << true;
- if (!kapp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
+ if (!tdeApp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
kdWarning(33001) << "Couldn't re-enabled screensaver (using dcop to kdesktop)" << endl;
}
if ( m_dpmsWasEnabled )
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 5578b6b2..54dd10da 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -272,14 +272,14 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
str = path + "/pics";
TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
const char *pics[] = { "home", "first", "next", "prev", "last", 0 };
@@ -295,7 +295,7 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
TDEIO::NetAccess::file_copy( srcurl, desturl, -1, true /*overwrite*/);
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
}
}
@@ -318,7 +318,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
}
}
@@ -523,7 +523,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
int p = progressBar->progress();
progressBar->setProgress( ++p );
- kapp->processEvents();
+ tdeApp->processEvents();
}
}
@@ -570,7 +570,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
progressBar->setProgress( progressBar->totalSteps() );
- kapp->processEvents();
+ tdeApp->processEvents();
}
void KPrWebPresentation::init()
diff --git a/kpresenter/TODO b/kpresenter/TODO
index c69f36a1..fa4cea47 100644
--- a/kpresenter/TODO
+++ b/kpresenter/TODO
@@ -29,7 +29,7 @@ KOffice in general:
=======================
- koTemplateChooseDia:
- Restart with last presentation (suggesting it in initial "open" dialog)
- (using kapp->getConfig)
+ (using tdeApp->getConfig)
KPresenter after koffice 1.3
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-23 22:31:17 +0000