summaryrefslogtreecommitdiffstats
path: root/kcontrol/kthememanager
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kthememanager')
-rw-r--r--kcontrol/kthememanager/knewthemedlg.cpp2
-rw-r--r--kcontrol/kthememanager/ktheme.cpp10
-rw-r--r--kcontrol/kthememanager/kthemedlg.ui4
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp32
4 files changed, 24 insertions, 24 deletions
diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp
index 76af5490a..220408ab9 100644
--- a/kcontrol/kthememanager/knewthemedlg.cpp
+++ b/kcontrol/kthememanager/knewthemedlg.cpp
@@ -28,7 +28,7 @@ KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name )
{
m_base = new NewThemeWidget( this, "new_theme_base" );
setMainWidget( m_base );
- connect( m_base->leName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotThemeNameChanged( const TQString & ) ) );
+ connect( m_base->leName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotThemeNameChanged( const TQString & ) ) );
slotThemeNameChanged( m_base->leName->text() );
}
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 1068eb325..4827f1c40 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <kipc.h>
#include <tdelocale.h>
#include <kservice.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
#include <ktar.h>
#include <tdestyle.h>
@@ -436,7 +436,7 @@ void KTheme::apply()
desktopConf.sync(); // TODO sync and signal only if <desktop> elem present
// reconfigure kdesktop. kdesktop will notify all clients
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if ( !client->isAttached() ) {
client->attach();
}
@@ -535,7 +535,7 @@ void KTheme::apply()
TDEConfig * colorConf = TDEGlobal::config();
TQString sCurrentScheme = locateLocal("data", "tdedisplay/color-schemes/thememgr.kcsrc");
- KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
+ TDESimpleConfig *colorScheme = new TDESimpleConfig( sCurrentScheme );
colorScheme->setGroup("Color Scheme" );
for ( uint i = 0; i < colorList.count(); i++ )
@@ -657,7 +657,7 @@ void KTheme::apply()
if ( !fontsElem.isNull() )
{
TDEConfig * fontsConf = TDEGlobal::config();
- TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+ TDEConfig * kde1xConf = new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
kde1xConf->setGroup( "General" );
TQDomNodeList fontList = fontsElem.childNodes();
diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui
index 717f68e32..8f7fade9d 100644
--- a/kcontrol/kthememanager/kthemedlg.ui
+++ b/kcontrol/kthememanager/kthemedlg.ui
@@ -503,7 +503,7 @@
<include location="local" impldecl="in implementation">kthemedlg.ui.h</include>
<include location="global" impldecl="in implementation">kurllabel.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot specifier="non virtual">startKonqui( const TQString &amp; url )</slot>
<slot specifier="non virtual">startBackground()</slot>
<slot specifier="non virtual">startColors()</slot>
@@ -511,6 +511,6 @@
<slot specifier="non virtual">startIcons()</slot>
<slot specifier="non virtual">startFonts()</slot>
<slot specifier="non virtual">startSaver()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 6a4132745..46dcbd59e 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -34,7 +34,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include "kthememanager.h"
@@ -66,26 +66,26 @@ kthememanager::kthememanager( TQWidget *parent, const char *name )
dlg->lvThemes->setColumnWidthMode( 0, TQListView::Maximum );
- connect( ( TQObject * )dlg->btnInstall, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotInstallTheme() ) );
+ connect( ( TQObject * )dlg->btnInstall, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotInstallTheme() ) );
- connect( ( TQObject * )dlg->btnRemove, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotRemoveTheme() ) );
+ connect( ( TQObject * )dlg->btnRemove, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotRemoveTheme() ) );
- connect( ( TQObject * )dlg->btnCreate, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotCreateTheme() ) );
+ connect( ( TQObject * )dlg->btnCreate, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( slotCreateTheme() ) );
- connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
- this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
+ connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+ this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) );
- connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
- this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
+ connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
+ this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) );
- connect( this, TQT_SIGNAL( filesDropped( const KURL::List& ) ),
- this, TQT_SLOT( updateButton() ) );
+ connect( this, TQ_SIGNAL( filesDropped( const KURL::List& ) ),
+ this, TQ_SLOT( updateButton() ) );
- connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
- this, TQT_SLOT( updateButton() ) );
+ connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+ this, TQ_SLOT( updateButton() ) );
m_origTheme = new KTheme( this, true ); // stores the defaults to get back to
m_origTheme->setName( ORIGINAL_THEME );
@@ -413,7 +413,7 @@ void kthememanager::updatePreview( const TQString & pixFile )
extern "C"
{
- KDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *)
+ TDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *)
{
TDEGlobal::locale()->insertCatalogue( "kthememanager" );
return new kthememanager( parent, "kthememanager" );
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 06:24:54 +0000