summaryrefslogtreecommitdiffstats
path: root/kwin/kcmkwin/kwinrules
diff options
context:
space:
mode:
Diffstat (limited to 'kwin/kcmkwin/kwinrules')
-rw-r--r--kwin/kcmkwin/kwinrules/CMakeLists.txt22
-rw-r--r--kwin/kcmkwin/kwinrules/Makefile.am34
-rw-r--r--kwin/kcmkwin/kwinrules/detectwidget.cpp2
-rw-r--r--kwin/kcmkwin/kwinrules/detectwidget.h2
-rw-r--r--kwin/kcmkwin/kwinrules/kcm.cpp14
-rw-r--r--kwin/kcmkwin/kwinrules/kwinrules.desktop6
-rw-r--r--kwin/kcmkwin/kwinrules/kwinsrc.cpp2
-rw-r--r--kwin/kcmkwin/kwinrules/main.cpp12
-rw-r--r--kwin/kcmkwin/kwinrules/ruleslist.cpp4
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidget.cpp2
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidget.h2
11 files changed, 51 insertions, 51 deletions
diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules/CMakeLists.txt
index d505cf709..29aa24e4e 100644
--- a/kwin/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt
@@ -13,7 +13,7 @@ add_definitions( -DKCMRULES )
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kwin/lib
+ ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -24,30 +24,30 @@ link_directories(
##### other data ################################
-install( FILES kwinrules.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES twinrules.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-##### kcm_kwinrules (module) ####################
+##### kcm_twinrules (module) ####################
-tde_add_kpart( kcm_kwinrules AUTOMOC
+tde_add_kpart( kcm_twinrules AUTOMOC
SOURCES kcm.cpp
- LINK kwinrules-static
+ LINK twinrules-static
DESTINATION ${PLUGIN_INSTALL_DIR} )
-##### kwin_rules_dialog (tdeinit) ###############
+##### twin_rules_dialog (tdeinit) ###############
-tde_add_tdeinit_executable( kwin_rules_dialog
+tde_add_tdeinit_executable( twin_rules_dialog
SOURCES main.cpp
- LINK ${TQT_LIBRARIES} kwinrules-static )
+ LINK ${TQT_LIBRARIES} twinrules-static )
-##### kwinrules (static) ########################
+##### twinrules (static) ########################
-set( target kwinrules )
+set( target twinrules )
set( ${target}_SRCS
- ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp
+ ruleswidget.cpp ruleslist.cpp twinsrc.cpp detectwidget.cpp
ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui
editshortcutbase.ui )
diff --git a/kwin/kcmkwin/kwinrules/Makefile.am b/kwin/kcmkwin/kwinrules/Makefile.am
index 6fe4b8108..c9e7c7beb 100644
--- a/kwin/kcmkwin/kwinrules/Makefile.am
+++ b/kwin/kcmkwin/kwinrules/Makefile.am
@@ -1,29 +1,29 @@
METASOURCES = AUTO
AM_CPPFLAGS = $(all_includes) -DKCMRULES
-INCLUDES = -I$(top_srcdir)/kwin/lib
+INCLUDES = -I$(top_srcdir)/twin/lib
bin_PROGRAMS =
lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = kwin_rules_dialog.la
-kde_module_LTLIBRARIES = kcm_kwinrules.la
-noinst_LTLIBRARIES = libkwinrules.la
+tdeinit_LTLIBRARIES = twin_rules_dialog.la
+kde_module_LTLIBRARIES = kcm_twinrules.la
+noinst_LTLIBRARIES = libtwinrules.la
-libkwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp \
+libtwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp twinsrc.cpp detectwidget.cpp \
ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui
-libkwinrules_la_LDFLAGS = $(all_libraries) -no-undefined
-libkwinrules_la_LIBADD = $(LIB_TDEUI)
+libtwinrules_la_LDFLAGS = $(all_libraries) -no-undefined
+libtwinrules_la_LIBADD = $(LIB_TDEUI)
-kcm_kwinrules_la_SOURCES = kcm.cpp
-kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kcm_kwinrules_la_LIBADD = libkwinrules.la
-kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
+kcm_twinrules_la_SOURCES = kcm.cpp
+kcm_twinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+kcm_twinrules_la_LIBADD = libtwinrules.la
+kcm_twinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
-kwin_rules_dialog_la_SOURCES = main.cpp
-kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kwin_rules_dialog_la_LIBADD = libkwinrules.la
-kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
+twin_rules_dialog_la_SOURCES = main.cpp
+twin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+twin_rules_dialog_la_LIBADD = libtwinrules.la
+twin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot
+ $(XGETTEXT) *.cpp -o $(podir)/kcmtwinrules.pot
-xdg_apps_DATA = kwinrules.desktop
+xdg_apps_DATA = twinrules.desktop
diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp
index c30ae24ff..d82836868 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp
@@ -21,7 +21,7 @@
#include <kapplication.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
#include <tqlabel.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
diff --git a/kwin/kcmkwin/kwinrules/detectwidget.h b/kwin/kcmkwin/kwinrules/detectwidget.h
index 9a2cca3d2..75e725f5f 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.h
+++ b/kwin/kcmkwin/kwinrules/detectwidget.h
@@ -23,7 +23,7 @@
#include "detectwidgetbase.h"
#include <kdialogbase.h>
-#include <kwin.h>
+#include <twin.h>
#include "../../rules.h"
diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp
index 90802c41d..c7cdc7587 100644
--- a/kwin/kcmkwin/kwinrules/kcm.cpp
+++ b/kwin/kcmkwin/kwinrules/kcm.cpp
@@ -28,10 +28,10 @@
#include "ruleslist.h"
extern "C"
- KDE_EXPORT KCModule *create_kwinrules( TQWidget *parent, const char *name )
+ KDE_EXPORT KCModule *create_twinrules( TQWidget *parent, const char *name )
{
- //CT there's need for decision: kwm or kwin?
- KGlobal::locale()->insertCatalogue( "kcmkwinrules" );
+ //CT there's need for decision: kwm or twin?
+ KGlobal::locale()->insertCatalogue( "kcmtwinrules" );
return new KWinInternal::KCMRules( parent, name );
}
@@ -40,13 +40,13 @@ namespace KWinInternal
KCMRules::KCMRules( TQWidget *parent, const char *name )
: KCModule( parent, name )
-, config( "kwinrulesrc" )
+, config( "twinrulesrc" )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
widget = new KCMRulesList( this );
layout->addWidget( TQT_TQWIDGET(widget) );
connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
- KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ),
+ KAboutData *about = new KAboutData(I18N_NOOP( "kcmtwinrules" ),
I18N_NOOP( "Window-Specific Settings Configuration Module" ),
0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
about->addAuthor("Lubos Lunak",0,"l.lunak@kde.org");
@@ -64,11 +64,11 @@ void KCMRules::save()
{
widget->save();
emit KCModule::changed( false );
- // Send signal to kwin
+ // Send signal to twin
config.sync();
if( !kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
- kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+ kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
}
void KCMRules::defaults()
diff --git a/kwin/kcmkwin/kwinrules/kwinrules.desktop b/kwin/kcmkwin/kwinrules/kwinrules.desktop
index 245994a8a..9d82ea38a 100644
--- a/kwin/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kwin/kcmkwin/kwinrules/kwinrules.desktop
@@ -1,12 +1,12 @@
[Desktop Entry]
Icon=kcmkwm
Type=Application
-Exec=kcmshell kwinrules
+Exec=kcmshell twinrules
DocPath=kcontrol/windowmanagement/index.html
X-KDE-ModuleType=Library
-X-KDE-Library=kwinrules
-X-KDE-FactoryName=kwinrules
+X-KDE-Library=twinrules
+X-KDE-FactoryName=twinrules
Name=Window-Specific Settings
Name[af]=Venser spesifike Instellings
diff --git a/kwin/kcmkwin/kwinrules/kwinsrc.cpp b/kwin/kcmkwin/kwinrules/kwinsrc.cpp
index 38f48e003..fb901efb6 100644
--- a/kwin/kcmkwin/kwinrules/kwinsrc.cpp
+++ b/kwin/kcmkwin/kwinrules/kwinsrc.cpp
@@ -1,4 +1,4 @@
-// Include some code from kwin core in order to avoid
+// Include some code from twin core in order to avoid
// double implementation.
#include "ruleslist.h"
diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp
index 4ed26a9e6..db3a9fc48 100644
--- a/kwin/kcmkwin/kwinrules/main.cpp
+++ b/kwin/kcmkwin/kwinrules/main.cpp
@@ -21,7 +21,7 @@
#include <dcopclient.h>
#include <kconfig.h>
#include <klocale.h>
-#include <kwin.h>
+#include <twin.h>
#include <X11/Xlib.h>
#include <fixx11h.h>
@@ -34,7 +34,7 @@ namespace KWinInternal
static void loadRules( TQValueList< Rules* >& rules )
{
- KConfig cfg( "kwinrulesrc", true );
+ KConfig cfg( "twinrulesrc", true );
cfg.setGroup( "General" );
int count = cfg.readNumEntry( "count" );
for( int i = 1;
@@ -49,7 +49,7 @@ static void loadRules( TQValueList< Rules* >& rules )
static void saveRules( const TQValueList< Rules* >& rules )
{
- KConfig cfg( "kwinrulesrc" );
+ KConfig cfg( "twinrulesrc" );
TQStringList groups = cfg.groupList();
for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
@@ -258,7 +258,7 @@ static int edit( Window wid, bool whole_app )
saveRules( rules );
if( !kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
- kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+ kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
return 0;
}
@@ -275,8 +275,8 @@ static const KCmdLineOptions options[] =
extern "C"
KDE_EXPORT int kdemain( int argc, char* argv[] )
{
- KLocale::setMainCatalogue( "kcmkwinrules" );
- KCmdLineArgs::init( argc, argv, "kwin_rules_dialog", I18N_NOOP( "KWin" ),
+ KLocale::setMainCatalogue( "kcmtwinrules" );
+ KCmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "KWin" ),
I18N_NOOP( "KWin helper utility" ), "1.0" );
KCmdLineArgs::addCmdLineOptions( options );
KApplication app;
diff --git a/kwin/kcmkwin/kwinrules/ruleslist.cpp b/kwin/kcmkwin/kwinrules/ruleslist.cpp
index e525e472f..29e02549d 100644
--- a/kwin/kcmkwin/kwinrules/ruleslist.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleslist.cpp
@@ -150,7 +150,7 @@ void KCMRulesList::load()
++it )
delete *it;
rules.clear();
- KConfig cfg( "kwinrulesrc", true );
+ KConfig cfg( "twinrulesrc", true );
cfg.setGroup( "General" );
int count = cfg.readNumEntry( "count" );
rules.reserve( count );
@@ -171,7 +171,7 @@ void KCMRulesList::load()
void KCMRulesList::save()
{
- KConfig cfg( "kwinrulesrc" );
+ KConfig cfg( "twinrulesrc" );
TQStringList groups = cfg.groupList();
for( TQStringList::ConstIterator it = groups.begin();
it != groups.end();
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
index 7a82a8149..cfe96458e 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
@@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <kpushbutton.h>
#include <tqlabel.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include <klocale.h>
#include <tqregexp.h>
#include <tqwhatsthis.h>
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h
index b47ad88ab..2a9b0d036 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.h
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.h
@@ -21,7 +21,7 @@
#define __RULESWIDGET_H__
#include <kdialogbase.h>
-#include <kwin.h>
+#include <twin.h>
#include <kshortcutdialog.h>
#include "ruleswidgetbase.h"