diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
| commit | 3fe437def8063926892bddf2dcc733861308836d (patch) | |
| tree | 021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /chalk/plugins | |
| parent | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff) | |
| download | koffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz koffice-3fe437def8063926892bddf2dcc733861308836d.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins')
| -rw-r--r-- | chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc | 4 | ||||
| -rw-r--r-- | chalk/plugins/viewplugins/screenshot/ksnapshot.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index 962a2ac68..f95fba85a 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -48,7 +48,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, setMainWidget(m_page); resize(m_page->sizeHint()); - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) ); m_page->yOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_y", 8) ); m_page->blurRadiusSpinBox->setValue( cfg->readNumEntry("dropshadow_blurRadius", 5) ); @@ -103,7 +103,7 @@ bool DlgDropshadow::allowResizingChecked() void DlgDropshadow::okClicked() { - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->writeEntry("dropshadow_x", m_page->xOffsetSpinBox->value()); cfg->writeEntry("dropshadow_y", m_page->yOffsetSpinBox->value()); cfg->writeEntry("dropshadow_blurRadius", m_page->blurRadiusSpinBox->value()); diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index d4e4bf775..b10dc8737 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -91,7 +91,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name) grabber->releaseMouse(); grabber->hide(); - KConfig *conf=TDEGlobal::config(); + TDEConfig *conf=TDEGlobal::config(); conf->setGroup("GENERAL"); mainWidget->setDelay(conf->readNumEntry("delay",0)); mainWidget->setMode( conf->readNumEntry( "mode", 0 ) ); @@ -142,7 +142,7 @@ bool KSnapshot::save( const KURL& url ) if ( tmpFile.status() == 0 ) { if ( snapshot.save( tmpFile.file(), type.latin1() ) ) { if ( tmpFile.close() ) - ok = KIO::NetAccess::upload( tmpFile.name(), url, this ); + ok = TDEIO::NetAccess::upload( tmpFile.name(), url, this ); } } } @@ -467,7 +467,7 @@ void KSnapshot::slotMovePointer(int x, int y) void KSnapshot::exit() { - KConfig *conf=TDEGlobal::config(); + TDEConfig *conf=TDEGlobal::config(); conf->setGroup("GENERAL"); conf->writeEntry("delay",mainWidget->delay()); conf->writeEntry("mode",mainWidget->mode()); @@ -482,7 +482,7 @@ void KSnapshot::exit() void KSnapshot::slotOk() { - KConfig *conf=TDEGlobal::config(); + TDEConfig *conf=TDEGlobal::config(); conf->setGroup("GENERAL"); conf->writeEntry("delay",mainWidget->delay()); conf->writeEntry("mode",mainWidget->mode()); |