summaryrefslogtreecommitdiffstats
path: root/kpresenter
diff options
context:
space:
mode:
Diffstat (limited to 'kpresenter')
-rw-r--r--kpresenter/KPrBackground.cpp2
-rw-r--r--kpresenter/KPrCanvas.cpp16
-rw-r--r--kpresenter/KPrConfig.cpp4
-rw-r--r--kpresenter/KPrDocument.cpp16
-rw-r--r--kpresenter/KPrEffectDia.cpp2
-rw-r--r--kpresenter/KPrMSPresentationSetup.cpp2
-rw-r--r--kpresenter/KPrObject.cpp60
-rw-r--r--kpresenter/KPrSlideTransitionDia.cpp2
-rw-r--r--kpresenter/KPrTextObject.cpp54
-rw-r--r--kpresenter/KPrTransEffectDia.cpp2
-rw-r--r--kpresenter/KPrView.cpp22
-rw-r--r--kpresenter/KPrWebPresentation.cpp16
12 files changed, 99 insertions, 99 deletions
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index e8dcdc394..5a6da29e9 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -525,7 +525,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 = KGlobalSettings::desktopGeometry(TQT_TQWIDGET(kapp->activeWindow()));
+ TQRect desk = TDEGlobalSettings::desktopGeometry(TQT_TQWIDGET(kapp->activeWindow()));
#else
TQRect desk = TQApplication::desktop()->screenGeometry();
#endif
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index e4a757447..c72768a7f 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -227,7 +227,7 @@ bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e )
case TQEvent::KeyPress:
{
TQKeyEvent * keyev = TQT_TQKEYEVENT(e);
- if ( keyev->key() == KGlobalSettings::contextMenuKey() ) {
+ if ( keyev->key() == TDEGlobalSettings::contextMenuKey() ) {
popupContextMenu();
return true;
}
@@ -333,7 +333,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent )
#if 0 // this works but isn't enough - e.g. object effects need the same offsets
// so we should store them, but they don't work like diffx/diffy...
// (e.g. the painter mustn't be translated when painting the background)
- TQRect desk = KGlobalSettings::desktopGeometry(this);
+ TQRect desk = TDEGlobalSettings::desktopGeometry(this);
TQRect pgRect = m_view->kPresenterDoc()->pageList().at(0)->getZoomPageRect();
int offx = 0, offy = 0;
if ( desk.width() > pgRect.width() )
@@ -488,7 +488,7 @@ void KPrCanvas::drawBackground( TQPainter *painter, const TQRect& rect, KPrPage
// Old code, left a black area if zoomX != zoomY
//page->background()->draw( painter, m_view->zoomHandler(), rect, false );
- TQRect desk = KGlobalSettings::desktopGeometry(getView());
+ TQRect desk = TDEGlobalSettings::desktopGeometry(getView());
TQRect crect = desk.intersect( rect );
if ( crect.isEmpty() || !page->displayBackground())
return;
@@ -2213,7 +2213,7 @@ void KPrCanvas::resizeEvent( TQResizeEvent *e )
TQWidget::resizeEvent( e );
}
else
- TQWidget::resizeEvent( new TQResizeEvent( KGlobalSettings::desktopGeometry(this).size(),
+ TQWidget::resizeEvent( new TQResizeEvent( TDEGlobalSettings::desktopGeometry(this).size(),
e->oldSize() ) );
buffer.resize( size() );
}
@@ -3075,7 +3075,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
}
m_setPageTimer = true;
- TQRect desk = KGlobalSettings::desktopGeometry(this);
+ TQRect desk = TDEGlobalSettings::desktopGeometry(this);
TQPixmap _pix1( desk.width(), desk.height() );
drawCurrentPageInPix( _pix1 );
@@ -3132,7 +3132,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
{
m_view->setPageDuration( m_step.m_pageNumber );
- TQRect desk = KGlobalSettings::desktopGeometry(this);
+ TQRect desk = TDEGlobalSettings::desktopGeometry(this);
TQPixmap lastSlide( desk.width(), desk.height() );
TQFont font( m_view->kPresenterDoc()->defaultFont().family() );
TQPainter p( &lastSlide );
@@ -4113,7 +4113,7 @@ void KPrCanvas::gotoPage( int pg )
m_step.m_step = *m_pageEffectSteps.begin();
m_step.m_subStep = 0;
#if 0
- TQRect desk = KGlobalSettings::desktopGeometry(this);
+ TQRect desk = TDEGlobalSettings::desktopGeometry(this);
resize( desk.width(), desk.height() );
#endif
doObjEffects();
@@ -4452,7 +4452,7 @@ void KPrCanvas::picViewOrigFactor()
void KPrCanvas::scalePixmapToBeOrigIn( const KoSize &currentSize, const KoSize &pgSize,
const TQSize &presSize, KPrPixmapObject *obj )
{
- TQRect desk = KGlobalSettings::desktopGeometry(this);
+ TQRect desk = TDEGlobalSettings::desktopGeometry(this);
double faktX = (double)presSize.width() / (double)desk.width();
double faktY = (double)presSize.height() / (double)desk.height();
double w = pgSize.width() * faktX;
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 48afca3a2..731759d9d 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -792,7 +792,7 @@ void KPrConfigureDefaultDocPage::slotDefault()
m_tabStopWidth->setValue( MM_TO_POINT(15));
m_createBackupFile->setChecked( true );
m_directInsertCursor->setChecked( false );
- m_globalLanguage->setCurrentText( KoGlobal::languageFromTag( KGlobal::locale()->language() ) );
+ m_globalLanguage->setCurrentText( KoGlobal::languageFromTag( TDEGlobal::locale()->language() ) );
m_autoHyphenation->setChecked( false );
}
@@ -994,7 +994,7 @@ void KPrConfigurePathPage::slotDefault()
{
TQListViewItem * item = m_pPathView->findItem(i18n("Picture Path"), 0);
if ( item )
- item->setText(1, KGlobalSettings::documentPath());
+ item->setText(1, TDEGlobalSettings::documentPath());
item = m_pPathView->findItem(i18n("Backup Path"), 0);
if ( item )
item->setText(1, TQString() );
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 535ee46eb..dad2baf60 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -150,8 +150,8 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje
m_tabStop = MM_TO_POINT( 15.0 );
m_styleColl=new KoStyleCollection();
m_insertFilePage = 0;
- m_picturePath= KGlobalSettings::documentPath();
- m_globalLanguage = KGlobal::locale()->language();
+ m_picturePath= TDEGlobalSettings::documentPath();
+ m_globalLanguage = TDEGlobal::locale()->language();
m_bGlobalHyphenation = false;
_duplicatePage=false;
@@ -184,7 +184,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje
if( config->hasGroup("Interface") ) {
config->setGroup( "Interface" );
- m_globalLanguage=config->readEntry("language", KGlobal::locale()->language());
+ m_globalLanguage=config->readEntry("language", TDEGlobal::locale()->language());
m_bGlobalHyphenation=config->readBoolEntry("hyphenation", false);
}
@@ -344,7 +344,7 @@ void KPrDocument::initConfig()
setGridY( config->readDoubleNumEntry( "ResolutionY", MM_TO_POINT( 5.0 ) ));
m_bInsertDirectCursor= config->readBoolEntry( "InsertDirectCursor", false );
- m_globalLanguage=config->readEntry("language", KGlobal::locale()->language());
+ m_globalLanguage=config->readEntry("language", TDEGlobal::locale()->language());
}
else
@@ -382,7 +382,7 @@ void KPrDocument::initConfig()
if(config->hasGroup("Kpresenter Path" ) )
{
config->setGroup( "Kpresenter Path" );
- m_picturePath=config->readPathEntry( "picture path",KGlobalSettings::documentPath());
+ m_picturePath=config->readPathEntry( "picture path",TDEGlobalSettings::documentPath());
setBackupPath(config->readPathEntry( "backup path" ));
}
@@ -2221,7 +2221,7 @@ bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc )
// Launch the perl script on it
KTempFile tmpFileOut;
tmpFileOut.setAutoDelete( true );
- TQString cmd = KGlobal::dirs()->findExe("perl");
+ TQString cmd = TDEGlobal::dirs()->findExe("perl");
if (cmd.isEmpty())
{
setErrorMessage( i18n("You don't appear to have PERL installed.\nIt is needed to convert this document.\nPlease install PERL and try again."));
@@ -2230,9 +2230,9 @@ bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc )
cmd += " ";
cmd += locate( "exe", "kprconverter.pl" );
cmd += " ";
- cmd += KProcess::quote( tmpFileIn.name() );
+ cmd += TDEProcess::quote( tmpFileIn.name() );
cmd += " ";
- cmd += KProcess::quote( tmpFileOut.name() );
+ cmd += TDEProcess::quote( tmpFileOut.name() );
system( TQFile::encodeName(cmd) );
// Build a new TQDomDocument from the result
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index 3d66f48a3..c40059b5b 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -427,7 +427,7 @@ void KPrEffectDia::slotRequesterClicked( KURLRequester *requester )
requester->fileDialog()->setFilter( filter );
// find the first "sound"-resource that contains files
- TQStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" );
+ TQStringList soundDirs = TDEGlobal::dirs()->resourceDirs( "sound" );
if ( !soundDirs.isEmpty() ) {
KURL soundURL;
TQDir dir;
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index 4b8545e25..8cb8861d0 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -287,7 +287,7 @@ void KPrMSPresentation::init()
backColour = TQt::black;
textColour = TQt::white;
- path = KGlobalSettings::documentPath();
+ path = TDEGlobalSettings::documentPath();
}
KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_view )
diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp
index 8bc6089d5..52b673966 100644
--- a/kpresenter/KPrObject.cpp
+++ b/kpresenter/KPrObject.cpp
@@ -50,36 +50,36 @@
#include <KoDom.h>
#include <kdebug.h>
-const TQString &KPrObject::tagORIG=KGlobal::staticQString("ORIG");
-const TQString &KPrObject::attrX=KGlobal::staticQString("x");
-const TQString &KPrObject::attrY=KGlobal::staticQString("y");
-const TQString &KPrObject::tagSIZE=KGlobal::staticQString("SIZE");
-const TQString &KPrObject::attrWidth=KGlobal::staticQString("width");
-const TQString &KPrObject::attrHeight=KGlobal::staticQString("height");
-const TQString &KPrObject::tagSHADOW=KGlobal::staticQString("SHADOW");
-const TQString &KPrObject::attrDistance=KGlobal::staticQString("distance");
-const TQString &KPrObject::attrDirection=KGlobal::staticQString("direction");
-const TQString &KPrObject::attrColor=KGlobal::staticQString("color");
-const TQString &KPrObject::tagEFFECTS=KGlobal::staticQString("EFFECTS");
-const TQString &KPrObject::attrEffect=KGlobal::staticQString("effect");
-const TQString &KPrObject::attrEffect2=KGlobal::staticQString("effect2");
-const TQString &KPrObject::tagPRESNUM=KGlobal::staticQString("PRESNUM");
-const TQString &KPrObject::tagANGLE=KGlobal::staticQString("ANGLE");
-const TQString &KPrObject::tagDISAPPEAR=KGlobal::staticQString("DISAPPEAR");
-const TQString &KPrObject::attrDoit=KGlobal::staticQString("doit");
-const TQString &KPrObject::attrNum=KGlobal::staticQString("num");
-const TQString &KPrObject::tagFILLTYPE=KGlobal::staticQString("FILLTYPE");
-const TQString &KPrObject::tagGRADIENT=KGlobal::staticQString("GRADIENT");
-const TQString &KPrObject::tagPEN=KGlobal::staticQString("PEN");
-const TQString &KPrObject::tagBRUSH=KGlobal::staticQString("BRUSH");
-const TQString &KPrObject::attrValue=KGlobal::staticQString("value");
-const TQString &KPrObject::attrC1=KGlobal::staticQString("color1");
-const TQString &KPrObject::attrC2=KGlobal::staticQString("color2");
-const TQString &KPrObject::attrType=KGlobal::staticQString("type");
-const TQString &KPrObject::attrUnbalanced=KGlobal::staticQString("unbalanced");
-const TQString &KPrObject::attrXFactor=KGlobal::staticQString("xfactor");
-const TQString &KPrObject::attrYFactor=KGlobal::staticQString("yfactor");
-const TQString &KPrObject::attrStyle=KGlobal::staticQString("style");
+const TQString &KPrObject::tagORIG=TDEGlobal::staticQString("ORIG");
+const TQString &KPrObject::attrX=TDEGlobal::staticQString("x");
+const TQString &KPrObject::attrY=TDEGlobal::staticQString("y");
+const TQString &KPrObject::tagSIZE=TDEGlobal::staticQString("SIZE");
+const TQString &KPrObject::attrWidth=TDEGlobal::staticQString("width");
+const TQString &KPrObject::attrHeight=TDEGlobal::staticQString("height");
+const TQString &KPrObject::tagSHADOW=TDEGlobal::staticQString("SHADOW");
+const TQString &KPrObject::attrDistance=TDEGlobal::staticQString("distance");
+const TQString &KPrObject::attrDirection=TDEGlobal::staticQString("direction");
+const TQString &KPrObject::attrColor=TDEGlobal::staticQString("color");
+const TQString &KPrObject::tagEFFECTS=TDEGlobal::staticQString("EFFECTS");
+const TQString &KPrObject::attrEffect=TDEGlobal::staticQString("effect");
+const TQString &KPrObject::attrEffect2=TDEGlobal::staticQString("effect2");
+const TQString &KPrObject::tagPRESNUM=TDEGlobal::staticQString("PRESNUM");
+const TQString &KPrObject::tagANGLE=TDEGlobal::staticQString("ANGLE");
+const TQString &KPrObject::tagDISAPPEAR=TDEGlobal::staticQString("DISAPPEAR");
+const TQString &KPrObject::attrDoit=TDEGlobal::staticQString("doit");
+const TQString &KPrObject::attrNum=TDEGlobal::staticQString("num");
+const TQString &KPrObject::tagFILLTYPE=TDEGlobal::staticQString("FILLTYPE");
+const TQString &KPrObject::tagGRADIENT=TDEGlobal::staticQString("GRADIENT");
+const TQString &KPrObject::tagPEN=TDEGlobal::staticQString("PEN");
+const TQString &KPrObject::tagBRUSH=TDEGlobal::staticQString("BRUSH");
+const TQString &KPrObject::attrValue=TDEGlobal::staticQString("value");
+const TQString &KPrObject::attrC1=TDEGlobal::staticQString("color1");
+const TQString &KPrObject::attrC2=TDEGlobal::staticQString("color2");
+const TQString &KPrObject::attrType=TDEGlobal::staticQString("type");
+const TQString &KPrObject::attrUnbalanced=TDEGlobal::staticQString("unbalanced");
+const TQString &KPrObject::attrXFactor=TDEGlobal::staticQString("xfactor");
+const TQString &KPrObject::attrYFactor=TDEGlobal::staticQString("yfactor");
+const TQString &KPrObject::attrStyle=TDEGlobal::staticQString("style");
KPrStartEndLine::KPrStartEndLine( LineEnd _start, LineEnd _end )
: lineBegin( _start ), lineEnd( _end )
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 9afecb258..553a1df16 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -239,7 +239,7 @@ void KPrSlideTransitionDia::slotRequesterClicked( KURLRequester * )
m_dialog->soundRequester->fileDialog()->setFilter( filter );
// find the first "sound"-resource that contains files
- TQStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" );
+ TQStringList soundDirs = TDEGlobal::dirs()->resourceDirs( "sound" );
if ( !soundDirs.isEmpty() ) {
KURL soundURL;
TQDir dir;
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 87db439d3..9a3d3a01d 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -77,33 +77,33 @@ using namespace std;
#undef S_NONE // Solaris defines it in sys/signal.h
-const TQString &KPrTextObject::tagTEXTOBJ=KGlobal::staticQString("TEXTOBJ");
-const TQString &KPrTextObject::attrLineSpacing=KGlobal::staticQString("lineSpacing");
-const TQString &KPrTextObject::attrParagSpacing=KGlobal::staticQString("paragSpacing");
-const TQString &KPrTextObject::attrMargin=KGlobal::staticQString("margin");
-const TQString &KPrTextObject::attrBulletType1=KGlobal::staticQString("bulletType1");
-const TQString &KPrTextObject::attrBulletType2=KGlobal::staticQString("bulletType2");
-const TQString &KPrTextObject::attrBulletType3=KGlobal::staticQString("bulletType3");
-const TQString &KPrTextObject::attrBulletType4=KGlobal::staticQString("bulletType4");
-const TQString &KPrTextObject::attrBulletColor1=KGlobal::staticQString("bulletColor1");
-const TQString &KPrTextObject::attrBulletColor2=KGlobal::staticQString("bulletColor2");
-const TQString &KPrTextObject::attrBulletColor3=KGlobal::staticQString("bulletColor3");
-const TQString &KPrTextObject::attrBulletColor4=KGlobal::staticQString("bulletColor4");
-const TQString &KPrTextObject::tagP=KGlobal::staticQString("P");
-const TQString &KPrTextObject::attrAlign=KGlobal::staticQString("align");
-const TQString &KPrTextObject::attrType=KGlobal::staticQString("type");
-const TQString &KPrTextObject::attrDepth=KGlobal::staticQString("depth");
-const TQString &KPrTextObject::tagTEXT=KGlobal::staticQString("TEXT");
-const TQString &KPrTextObject::attrFamily=KGlobal::staticQString("family");
-const TQString &KPrTextObject::attrPointSize=KGlobal::staticQString("pointSize");
-const TQString &KPrTextObject::attrBold=KGlobal::staticQString("bold");
-const TQString &KPrTextObject::attrItalic=KGlobal::staticQString("italic");
-const TQString &KPrTextObject::attrUnderline=KGlobal::staticQString("underline");
-const TQString &KPrTextObject::attrStrikeOut=KGlobal::staticQString("strikeOut");
-const TQString &KPrTextObject::attrColor=KGlobal::staticQString("color");
-const TQString &KPrTextObject::attrWhitespace=KGlobal::staticQString("whitespace");
-const TQString &KPrTextObject::attrTextBackColor=KGlobal::staticQString("textbackcolor");
-const TQString &KPrTextObject::attrVertAlign=KGlobal::staticQString("VERTALIGN");
+const TQString &KPrTextObject::tagTEXTOBJ=TDEGlobal::staticQString("TEXTOBJ");
+const TQString &KPrTextObject::attrLineSpacing=TDEGlobal::staticQString("lineSpacing");
+const TQString &KPrTextObject::attrParagSpacing=TDEGlobal::staticQString("paragSpacing");
+const TQString &KPrTextObject::attrMargin=TDEGlobal::staticQString("margin");
+const TQString &KPrTextObject::attrBulletType1=TDEGlobal::staticQString("bulletType1");
+const TQString &KPrTextObject::attrBulletType2=TDEGlobal::staticQString("bulletType2");
+const TQString &KPrTextObject::attrBulletType3=TDEGlobal::staticQString("bulletType3");
+const TQString &KPrTextObject::attrBulletType4=TDEGlobal::staticQString("bulletType4");
+const TQString &KPrTextObject::attrBulletColor1=TDEGlobal::staticQString("bulletColor1");
+const TQString &KPrTextObject::attrBulletColor2=TDEGlobal::staticQString("bulletColor2");
+const TQString &KPrTextObject::attrBulletColor3=TDEGlobal::staticQString("bulletColor3");
+const TQString &KPrTextObject::attrBulletColor4=TDEGlobal::staticQString("bulletColor4");
+const TQString &KPrTextObject::tagP=TDEGlobal::staticQString("P");
+const TQString &KPrTextObject::attrAlign=TDEGlobal::staticQString("align");
+const TQString &KPrTextObject::attrType=TDEGlobal::staticQString("type");
+const TQString &KPrTextObject::attrDepth=TDEGlobal::staticQString("depth");
+const TQString &KPrTextObject::tagTEXT=TDEGlobal::staticQString("TEXT");
+const TQString &KPrTextObject::attrFamily=TDEGlobal::staticQString("family");
+const TQString &KPrTextObject::attrPointSize=TDEGlobal::staticQString("pointSize");
+const TQString &KPrTextObject::attrBold=TDEGlobal::staticQString("bold");
+const TQString &KPrTextObject::attrItalic=TDEGlobal::staticQString("italic");
+const TQString &KPrTextObject::attrUnderline=TDEGlobal::staticQString("underline");
+const TQString &KPrTextObject::attrStrikeOut=TDEGlobal::staticQString("strikeOut");
+const TQString &KPrTextObject::attrColor=TDEGlobal::staticQString("color");
+const TQString &KPrTextObject::attrWhitespace=TDEGlobal::staticQString("whitespace");
+const TQString &KPrTextObject::attrTextBackColor=TDEGlobal::staticQString("textbackcolor");
+const TQString &KPrTextObject::attrVertAlign=TDEGlobal::staticQString("VERTALIGN");
KPrTextObject::KPrTextObject( KPrDocument *doc )
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index ba4217090..859c0c7b0 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -403,7 +403,7 @@ void KPrTransEffectDia::slotRequesterClicked( KURLRequester * )
requester->fileDialog()->setFilter( filter );
// find the first "sound"-resource that contains files
- TQStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" );
+ TQStringList soundDirs = TDEGlobal::dirs()->resourceDirs( "sound" );
if ( !soundDirs.isEmpty() ) {
KURL soundURL;
TQDir dir;
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index b1b943381..37ce7db8c 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -457,12 +457,12 @@ KPrView::~KPrView()
delete m_findReplace;
m_findReplace = 0L;
if(sidebar) {
- KConfig *config=KGlobal::config();
+ KConfig *config=TDEGlobal::config();
config->setGroup("Global");
config->writeEntry("Sidebar", sidebar->isVisible());
}
if(notebar) {
- KConfig *config=KGlobal::config();
+ KConfig *config=TDEGlobal::config();
config->setGroup("Global");
config->writeEntry("Notebar", notebar->isVisible());
}
@@ -1506,12 +1506,12 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
if ( m_canvas && !presStarted ) {
const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver");
if (!xdgScreenSaver.isEmpty()) {
- KProcess proc;
+ TDEProcess proc;
proc << xdgScreenSaver;
proc << "suspend";
proc << TQString::number( topLevelWidget()->winId() );
kdDebug() << k_funcinfo << proc.args() << endl;
- proc.start( KProcess::DontCare );
+ proc.start( TDEProcess::DontCare );
} else {
TQByteArray data;
TQByteArray replyData;
@@ -1548,7 +1548,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
deSelectAllObjects();
presStarted = true;
m_autoPresRestart = false;
- TQRect desk = KGlobalSettings::desktopGeometry(this);
+ TQRect desk = TDEGlobalSettings::desktopGeometry(this);
kdDebug(33001) << "KPrView::startScreenPres desk=" << desk << endl;
TQRect pgRect = kPresenterDoc()->pageList().at(0)->getZoomPageRect();
kdDebug(33001) << "KPrView::startScreenPres pgRect=" << pgRect << endl;
@@ -1630,12 +1630,12 @@ void KPrView::screenStop()
const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver");
if (!xdgScreenSaver.isEmpty()) {
- KProcess proc;
+ TDEProcess proc;
proc << xdgScreenSaver;
proc << "resume";
proc << TQString::number( topLevelWidget()->winId() );
kdDebug() << k_funcinfo << proc.args() << endl;
- proc.start( KProcess::DontCare );
+ proc.start( TDEProcess::DontCare );
} else {
if ( m_screenSaverWasEnabled )
{
@@ -2231,7 +2231,7 @@ void KPrView::createGUI()
{
sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() );
sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE );
- KConfig *config=KGlobal::config();
+ KConfig *config=TDEGlobal::config();
config->setGroup("Global");
if(!config->readBoolEntry("Sidebar", true)) {
sidebar->hide();
@@ -2242,7 +2242,7 @@ void KPrView::createGUI()
if ( notebar )
{
- KConfig *config=KGlobal::config();
+ KConfig *config=TDEGlobal::config();
config->setGroup("Global");
if(!config->readBoolEntry("Notebar", true)) {
notebar->hide();
@@ -5414,7 +5414,7 @@ void KPrView::pddClosed()
TQString KPrView::presentationDurationDataFormatChange( int _time )
{
TQTime time( 0, 0, 0 );
- return KGlobal::locale()->formatTime( time.addMSecs( _time ), true, true );
+ return TDEGlobal::locale()->formatTime( time.addMSecs( _time ), true, true );
}
@@ -6463,7 +6463,7 @@ void KPrView::documentModified( bool b )
return;
if ( b )
- m_sbModifiedLabel->setPixmap( KGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) );
+ m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) );
else
m_sbModifiedLabel->setText( " " );
}
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index d4df256b0..a8f56470c 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -387,7 +387,7 @@ void KPrWebPresentation::writeStartOfHeader(TQTextStream& streamOut, TQTextCodec
void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
{
- TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding );
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName( m_encoding );
const TQString brtag ( "<br" + TQString(isXML()?" /":"") + ">" );
@@ -511,7 +511,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
else
htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
- .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
+ .arg( TDEGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
streamOut << " </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n";
}
@@ -530,7 +530,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
void KPrWebPresentation::createMainPage( KProgress *progressBar )
{
- TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding );
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName( m_encoding );
KTempFile tmp;
TQString dest = TQString( "%1/index.html" ).arg( path );
TQFile file( tmp.name() );
@@ -562,7 +562,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) :
TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
- .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
+ .arg( TDEGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
streamOut << "</body>\n</html>\n";
file.close();
@@ -605,7 +605,7 @@ void KPrWebPresentation::init()
textColor = TQt::black;
titleColor = TQt::red;
- path = KGlobalSettings::documentPath() + "www";
+ path = TDEGlobalSettings::documentPath() + "www";
zoom = 100;
@@ -802,12 +802,12 @@ void KPrWebPresentationWizard::setupPage2()
// Fill encoding combo
// Stolen from tdelibs/kate/part/katedialogs.cpp
- TQStringList encodings(KGlobal::charsets()->descriptiveEncodingNames());
+ TQStringList encodings(TDEGlobal::charsets()->descriptiveEncodingNames());
int idx = 0;
for (uint i = 0; i < encodings.count(); i++)
{
bool found = false;
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found);
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found);
if (found)
{
encoding->insertItem(encodings[i]);
@@ -1060,7 +1060,7 @@ void KPrWebPresentationWizard::finish()
webPres.setLoopSlides( loopSlides->isChecked() );
webPres.setXML( doctype->currentItem() != 0 );
bool found = false;
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encoding->currentText()), found);
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encoding->currentText()), found);
if ( found )
{
webPres.setEncoding( codecForEnc->name() );
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 15:08:30 +0000