summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
commitf537c21b68e08f649b1b297bce8f3904603137e0 (patch)
treefb33065387509dea898c90022ddec9c3f8ede86d /twin/kcmtwin
parentdc5f267664506a312203c26bfe9001a448b0bb0f (diff)
downloadtdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz
tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'twin/kcmtwin')
-rw-r--r--twin/kcmtwin/twindecoration/buttons.cpp2
-rw-r--r--twin/kcmtwin/twindecoration/buttons.h2
-rw-r--r--twin/kcmtwin/twinoptions/main.cpp14
-rw-r--r--twin/kcmtwin/twinoptions/main.h6
-rw-r--r--twin/kcmtwin/twinrules/ruleslistbase.ui2
-rw-r--r--twin/kcmtwin/twinrules/ruleswidget.cpp14
-rw-r--r--twin/kcmtwin/twinrules/ruleswidget.h4
-rw-r--r--twin/kcmtwin/twinrules/ruleswidgetbase.ui2
8 files changed, 23 insertions, 23 deletions
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index fc00dea9d..55b5beb56 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -121,7 +121,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color)
ButtonSource::ButtonSource(TQWidget *parent, const char* name)
- : KListView(parent, name)
+ : TDEListView(parent, name)
{
setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h
index e1dbbc812..d3a794569 100644
--- a/twin/kcmtwin/twindecoration/buttons.h
+++ b/twin/kcmtwin/twindecoration/buttons.h
@@ -109,7 +109,7 @@ class ButtonSourceItem : public TQListViewItem
/**
* Implements the button drag source list view
*/
-class ButtonSource : public KListView
+class ButtonSource : public TDEListView
{
Q_OBJECT
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index aac2436d1..5e79c6365 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -48,7 +48,7 @@ extern "C"
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue("kcmkwm");
- return new KActionsOptions( parent, name);
+ return new TDEActionsOptions( parent, name);
}
KDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name)
@@ -201,7 +201,7 @@ void KWinOptions::moduleChanged(bool state)
}
-KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
+TDEActionsOptions::TDEActionsOptions(TQWidget *parent, const char *name)
: TDECModule(parent, name)
{
mConfig = new TDEConfig("twinrc", false, true);
@@ -221,12 +221,12 @@ KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
}
-KActionsOptions::~KActionsOptions()
+TDEActionsOptions::~TDEActionsOptions()
{
delete mConfig;
}
-void KActionsOptions::load()
+void TDEActionsOptions::load()
{
mTitleBarActions->load();
mWindowActions->load();
@@ -234,7 +234,7 @@ void KActionsOptions::load()
}
-void KActionsOptions::save()
+void TDEActionsOptions::save()
{
mTitleBarActions->save();
mWindowActions->save();
@@ -248,13 +248,13 @@ void KActionsOptions::save()
}
-void KActionsOptions::defaults()
+void TDEActionsOptions::defaults()
{
mTitleBarActions->defaults();
mWindowActions->defaults();
}
-void KActionsOptions::moduleChanged(bool state)
+void TDEActionsOptions::moduleChanged(bool state)
{
emit TDECModule::changed(state);
}
diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h
index c1146fa92..cb80f7e8d 100644
--- a/twin/kcmtwin/twinoptions/main.h
+++ b/twin/kcmtwin/twinoptions/main.h
@@ -69,14 +69,14 @@ private:
TDEConfig *mConfig;
};
-class KActionsOptions : public TDECModule
+class TDEActionsOptions : public TDECModule
{
Q_OBJECT
public:
- KActionsOptions(TQWidget *parent, const char *name);
- virtual ~KActionsOptions();
+ TDEActionsOptions(TQWidget *parent, const char *name);
+ virtual ~TDEActionsOptions();
void load();
void save();
diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index 8ab21412b..078d1ef2c 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KListBox" row="0" column="0" rowspan="6" colspan="1">
+ <widget class="TDEListBox" row="0" column="0" rowspan="6" colspan="1">
<property name="name">
<cstring>rules_listbox</cstring>
</property>
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index 8680018d7..dcf7cd358 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name )
void EditShortcut::editShortcut()
{
- ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget());
+ ShortcutDialog dlg( TDEShortcut( shortcut->text()), topLevelWidget());
if( dlg.exec() == TQDialog::Accepted )
shortcut->setText( dlg.shortcut().toString());
}
@@ -762,8 +762,8 @@ TQString EditShortcutDialog::shortcut() const
return widget->shortcut->text();
}
-ShortcutDialog::ShortcutDialog( const KShortcut& cut, TQWidget* parent, const char* name )
- : KShortcutDialog( cut, false /*TODO???*/, parent, name )
+ShortcutDialog::ShortcutDialog( const TDEShortcut& cut, TQWidget* parent, const char* name )
+ : TDEShortcutDialog( cut, false /*TODO???*/, parent, name )
{
}
@@ -783,19 +783,19 @@ void ShortcutDialog::accept()
}
if( seq.key( 0 ) == Key_Space )
{ // clear
- setShortcut( KShortcut());
- KShortcutDialog::accept();
+ setShortcut( TDEShortcut());
+ TDEShortcutDialog::accept();
return;
}
if( seq.key( 0 ).modFlags() == 0 )
{ // no shortcuts without modifiers
- KShortcut cut = shortcut();
+ TDEShortcut cut = shortcut();
cut.setSeq( i, KKeySequence());
setShortcut( cut );
return;
}
}
- KShortcutDialog::accept();
+ TDEShortcutDialog::accept();
}
} // namespace
diff --git a/twin/kcmtwin/twinrules/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h
index 2a9b0d036..f3f6f9881 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.h
+++ b/twin/kcmtwin/twinrules/ruleswidget.h
@@ -135,11 +135,11 @@ class EditShortcutDialog
// slightly duped from utils.cpp
class ShortcutDialog
- : public KShortcutDialog
+ : public TDEShortcutDialog
{
Q_OBJECT
public:
- ShortcutDialog( const KShortcut& cut, TQWidget* parent = NULL, const char* name = NULL );
+ ShortcutDialog( const TDEShortcut& cut, TQWidget* parent = NULL, const char* name = NULL );
virtual void accept();
};
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index c83bbef92..d99b475b2 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -329,7 +329,7 @@
<cstring>types</cstring>
</property>
</widget>
- <widget class="KListBox" row="1" column="0" rowspan="1" colspan="4">
+ <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="4">
<item>
<property name="text">
<string>Normal Window</string>