summaryrefslogtreecommitdiffstats
path: root/chalk
diff options
context:
space:
mode:
Diffstat (limited to 'chalk')
-rw-r--r--chalk/chalkcolor/kis_abstract_colorspace.cc2
-rw-r--r--chalk/core/kis_meta_registry.cc18
-rw-r--r--chalk/core/kis_thread_pool.cc2
-rw-r--r--chalk/core/tiles/kis_tilemanager.cc4
-rw-r--r--chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc4
-rw-r--r--chalk/plugins/viewplugins/screenshot/ksnapshot.cpp6
-rw-r--r--chalk/plugins/viewplugins/screenshot/ksnapshot.h2
-rw-r--r--chalk/plugins/viewplugins/screenshot/regiongrabber.cpp2
-rw-r--r--chalk/plugins/viewplugins/screenshot/screenshot.cpp2
-rw-r--r--chalk/ui/kis_config.cc4
-rw-r--r--chalk/ui/kis_controlframe.cc2
-rw-r--r--chalk/ui/kis_custom_brush.cc2
-rw-r--r--chalk/ui/kis_custom_palette.cc2
-rw-r--r--chalk/ui/kis_custom_pattern.cc2
-rw-r--r--chalk/ui/kis_previewwidget.cc8
-rw-r--r--chalk/ui/kis_view.cc2
16 files changed, 32 insertions, 32 deletions
diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc
index 35994b66..444ac5a4 100644
--- a/chalk/chalkcolor/kis_abstract_colorspace.cc
+++ b/chalk/chalkcolor/kis_abstract_colorspace.cc
@@ -719,7 +719,7 @@ cmsHTRANSFORM KisAbstractColorSpace::createTransform(KisColorSpace * dstColorSpa
KisProfile * dstProfile,
TQ_INT32 renderingIntent)
{
- KConfig * cfg = KGlobal::config();
+ KConfig * cfg = TDEGlobal::config();
bool bpCompensation = cfg->readBoolEntry("useBlackPointCompensation", false);
int flags = 0;
diff --git a/chalk/core/kis_meta_registry.cc b/chalk/core/kis_meta_registry.cc
index c6025869..82912da5 100644
--- a/chalk/core/kis_meta_registry.cc
+++ b/chalk/core/kis_meta_registry.cc
@@ -33,20 +33,20 @@ KisMetaRegistry::KisMetaRegistry()
{
// Create the colorspaces and load the profiles
- KGlobal::instance()->dirs()->addResourceType("kis_profiles",
+ TDEGlobal::instance()->dirs()->addResourceType("kis_profiles",
KStandardDirs::kde_default("data") + "chalk/profiles/");
// Add those things here as well, since we are not yet using KisDoc's KisFactory instance (which inits these as well)
- KGlobal::instance()->dirs()->addResourceType("kis_profiles", KStandardDirs::kde_default("data") + "chalk/profiles/");
- KGlobal::instance()->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc");
- KGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.icc/"));
- KGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.color/icc/"));
+ TDEGlobal::instance()->dirs()->addResourceType("kis_profiles", KStandardDirs::kde_default("data") + "chalk/profiles/");
+ TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc");
+ TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.icc/"));
+ TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.color/icc/"));
TQStringList profileFilenames;
- profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icm", true /* recursive */);
- profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICM", true);
- profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICC", true);
- profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icc", true);
+ profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icm", true /* recursive */);
+ profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICM", true);
+ profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICC", true);
+ profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icc", true);
// Set lcms to return NUll/false etc from failing calls, rather than aborting the app.
cmsErrorAction(LCMS_ERROR_SHOW);
diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc
index 2f80a0ae..cb537738 100644
--- a/chalk/core/kis_thread_pool.cc
+++ b/chalk/core/kis_thread_pool.cc
@@ -29,7 +29,7 @@ KisThreadPool::KisThreadPool()
KisThreadPool::m_singleton = this;
- KConfig * cfg = KGlobal::config();
+ KConfig * cfg = TDEGlobal::config();
cfg->setGroup("");
m_maxThreads = cfg->readNumEntry("maxthreads", 10);
m_numberOfRunningThreads = 0;
diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc
index 2fca4ec9..f734f594 100644
--- a/chalk/core/tiles/kis_tilemanager.cc
+++ b/chalk/core/tiles/kis_tilemanager.cc
@@ -64,7 +64,7 @@ KisTileManager::KisTileManager() {
}
m_currentInMem = 0;
- KConfig * cfg = KGlobal::config();
+ KConfig * cfg = TDEGlobal::config();
cfg->setGroup("");
m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000);
m_swappiness = cfg->readNumEntry("swappiness", 100);
@@ -533,7 +533,7 @@ void KisTileManager::reclaimTileToPool(TQ_UINT8* data, TQ_INT32 pixelSize) {
}
void KisTileManager::configChanged() {
- KConfig * cfg = KGlobal::config();
+ KConfig * cfg = TDEGlobal::config();
cfg->setGroup("");
m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000);
m_swappiness = cfg->readNumEntry("swappiness", 100);
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
index 023a606a..962a2ac6 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 = KGlobal::config();
+ KConfig * 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 = KGlobal::config();
+ KConfig * 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 1f150e8f..d4e4bf77 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=KGlobal::config();
+ KConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL");
mainWidget->setDelay(conf->readNumEntry("delay",0));
mainWidget->setMode( conf->readNumEntry( "mode", 0 ) );
@@ -467,7 +467,7 @@ void KSnapshot::slotMovePointer(int x, int y)
void KSnapshot::exit()
{
- KConfig *conf=KGlobal::config();
+ KConfig *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=KGlobal::config();
+ KConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL");
conf->writeEntry("delay",mainWidget->delay());
conf->writeEntry("mode",mainWidget->mode());
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
index 2267b1a8..ffa101d1 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
@@ -60,7 +60,7 @@ protected:
void mouseMoveEvent(TQMouseEvent * e)
{
if (mClickPt != TQPoint(0, 0) &&
- (e->pos() - mClickPt).manhattanLength() > KGlobalSettings::dndEventDelay())
+ (e->pos() - mClickPt).manhattanLength() > TDEGlobalSettings::dndEventDelay())
{
mClickPt = TQPoint(0, 0);
emit startDrag();
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index a192df11..06a4d544 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -57,7 +57,7 @@ void SizeTip::positionTip( const TQRect &rect )
if ( rect.intersects( tipRect ) )
{
- TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );
+ TQRect deskR = TDEGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );
tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index 57b28cd4..e6f3b9e9 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( chalkscreenshot, KGenericFactory<Screenshot>( "chalk
Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &)
: KParts::Plugin(parent, name)
{
- KGlobal::locale()->insertCatalogue("kscreenshot_plugin");
+ TDEGlobal::locale()->insertCatalogue("kscreenshot_plugin");
setInstance(KGenericFactory<Screenshot>::instance());
setXMLFile(locate("data","chalkplugins/screenshot-chalk.rc"), true);
KImageIO::registerFormats();
diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc
index 6d07790b..4c823ba5 100644
--- a/chalk/ui/kis_config.cc
+++ b/chalk/ui/kis_config.cc
@@ -44,7 +44,7 @@ namespace {
KisConfig::KisConfig()
{
- m_cfg = KGlobal::config();
+ m_cfg = TDEGlobal::config();
if (!m_cfg) {
// Allow unit tests to test parts of the code without having to run the
// full application.
@@ -330,7 +330,7 @@ float KisConfig::dockerFontSize()
float KisConfig::getDefaultDockerFontSize()
{
- float ps = TQMIN(9, KGlobalSettings::generalFont().pointSize() * 0.8);
+ float ps = TQMIN(9, TDEGlobalSettings::generalFont().pointSize() * 0.8);
if (ps < 6) ps = 6;
return ps;
}
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index 74f3cd0a..b75de805 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -96,7 +96,7 @@ KisControlFrame::KisControlFrame( KMainWindow * /*window*/, KisView * view, cons
{
KisConfig cfg;
- m_font = KGlobalSettings::generalFont();
+ m_font = TDEGlobalSettings::generalFont();
m_font.setPointSize((int)cfg.dockerFontSize());
m_brushWidget = new KisIconWidget(view, "brushes");
diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc
index 34289f3e..d235259f 100644
--- a/chalk/ui/kis_custom_brush.cc
+++ b/chalk/ui/kis_custom_brush.cc
@@ -82,7 +82,7 @@ void KisCustomBrush::slotExport() {
void KisCustomBrush::slotAddPredefined() {
// Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/brushes
// a unique file with this brushname
- TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/brushes");
+ TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/brushes");
TQString extension;
if (style->currentItem() == 0) {
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc
index f12b9300..8bd36142 100644
--- a/chalk/ui/kis_custom_palette.cc
+++ b/chalk/ui/kis_custom_palette.cc
@@ -121,7 +121,7 @@ void KisCustomPalette::slotAddPredefined() {
if (!m_editMode) {
// Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/palettes
// a unique file with this palettename
- TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/palettes");
+ TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/palettes");
TQString extension;
extension = ".gpl";
diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc
index 538ec9c6..8c2f22e2 100644
--- a/chalk/ui/kis_custom_pattern.cc
+++ b/chalk/ui/kis_custom_pattern.cc
@@ -80,7 +80,7 @@ void KisCustomPattern::slotAddPredefined() {
// Save in the directory that is likely to be: ~/.trinity/share/apps/chalk/patterns
// a unique file with this pattern name
- TQString dir = KGlobal::dirs()->saveLocation("data", "chalk/patterns");
+ TQString dir = TDEGlobal::dirs()->saveLocation("data", "chalk/patterns");
TQString extension;
KTempFile file(dir, ".pat");
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc
index 2598e79d..daed3a14 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cc
@@ -85,17 +85,17 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name )
, m_firstFilter(true)
, m_firstZoom(true)
{
- btnZoomIn->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 ));
+ btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 ));
connect(btnZoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomIn()));
- btnZoomOut->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 ));
+ btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 ));
connect(btnZoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOut()));
- btnUpdate->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "reload", KIcon::MainToolbar, 16 ));
+ btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", KIcon::MainToolbar, 16 ));
connect(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate()));
connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool)));
connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(bool)));
- btnZoomOneToOne->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 ));
+ btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 ));
connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne()));
m_progress = new KisLabelProgress(frmProgress);
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 26a657c3..cf3542b2 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -868,7 +868,7 @@ void KisView::resizeEvent(TQResizeEvent *)
}
}
- int fontheight = TQFontMetrics(KGlobalSettings::generalFont()).height() * 3;
+ int fontheight = TQFontMetrics(TDEGlobalSettings::generalFont()).height() * 3;
m_vScroll->setPageStep(drawH);
m_vScroll->setLineStep(fontheight);
m_hScroll->setPageStep(drawW);
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-10 16:24:45 +0000