diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:19:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:19:08 -0600 |
| commit | ac04782336b6a026b44df9d51ba9ca008a712da2 (patch) | |
| tree | 62ad1da391a6dad027a2d371671b19e5306acee0 /kpresenter | |
| parent | f7055674768fa7f0267da4a14b9061e60ebab3fc (diff) | |
| download | koffice-ac04782336b6a026b44df9d51ba9ca008a712da2.tar.gz koffice-ac04782336b6a026b44df9d51ba9ca008a712da2.zip | |
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'kpresenter')
| -rw-r--r-- | kpresenter/KPrFactory.cpp | 6 | ||||
| -rw-r--r-- | kpresenter/KPrView.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp index 5a1a6be0..994b14e4 100644 --- a/kpresenter/KPrFactory.cpp +++ b/kpresenter/KPrFactory.cpp @@ -70,11 +70,11 @@ TDEInstance* KPrFactory::global() s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType("kpresenter_template", - KStandardDirs::kde_default("data") + "kpresenter/templates/"); + TDEStandardDirs::kde_default("data") + "kpresenter/templates/"); s_global->dirs()->addResourceType("autoforms", - KStandardDirs::kde_default("data") + "kpresenter/autoforms/"); + TDEStandardDirs::kde_default("data") + "kpresenter/autoforms/"); s_global->dirs()->addResourceType("slideshow", - KStandardDirs::kde_default("data") + "kpresenter/slideshow/"); + TDEStandardDirs::kde_default("data") + "kpresenter/slideshow/"); // Tell the iconloader about share/apps/koffice/icons s_global->iconLoader()->addAppDir("koffice"); } diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index bf57df2e..d6407823 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -1353,7 +1353,7 @@ void KPrView::extraCreateTemplate() KoTemplateCreateDia::createTemplate( "kpresenter_template", KPrFactory::global(), tempFile.name(), pix, this); KPrFactory::global()->dirs()->addResourceType("kpresenter_template", - KStandardDirs::kde_default( "data" ) + + TDEStandardDirs::kde_default( "data" ) + "kpresenter/templates/"); } @@ -1504,7 +1504,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) m_canvas->setToolEditMode( TEM_MOUSE ); if ( m_canvas && !presStarted ) { - const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver"); + const TQString xdgScreenSaver = TDEStandardDirs::findExe("xdg-screensaver"); if (!xdgScreenSaver.isEmpty()) { TDEProcess proc; proc << xdgScreenSaver; @@ -1628,7 +1628,7 @@ void KPrView::screenStop() m_canvas->setMouseTracking( true ); m_canvas->setBackgroundMode( TQt::NoBackground ); - const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver"); + const TQString xdgScreenSaver = TDEStandardDirs::findExe("xdg-screensaver"); if (!xdgScreenSaver.isEmpty()) { TDEProcess proc; proc << xdgScreenSaver; |