4 files changed, 24 insertions, 24 deletions

diff --git a/kwin/clients/kwmtheme/Makefile.am b/kwin/clients/kwmtheme/Makefile.am
index a3a91080a..e9d3c36b8 100644
--- a/kwin/clients/kwmtheme/Makefile.am
+++ b/kwin/clients/kwmtheme/Makefile.am
@@ -1,15 +1,15 @@
 SUBDIRS=cli_installer
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = kwin3_kwmtheme.la
+kde_module_LTLIBRARIES = twin3_kwmtheme.la
 
-kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
-kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_kwmtheme_la_LIBADD  = -ltdecorations
+twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
+twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_kwmtheme_la_LIBADD  = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = kwmthemeclient.h
 
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
 lnk_DATA = kwmtheme.desktop
 
diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp
index 56de8c9fe..4533cf3e8 100644
--- a/kwin/clients/kwmtheme/cli_installer/main.cpp
+++ b/kwin/clients/kwmtheme/cli_installer/main.cpp
@@ -57,10 +57,10 @@ int main(int argc, char **argv)
         return(2);
     }
 
-    TQStringList appDirs = KGlobal::dirs()->findDirs("data", "kwin");
+    TQStringList appDirs = KGlobal::dirs()->findDirs("data", "twin");
     TQString localDirStr = *(appDirs.end());
     if(localDirStr.isEmpty()){
-        localDirStr = KGlobal::dirs()->saveLocation("data", "kwin");
+        localDirStr = KGlobal::dirs()->saveLocation("data", "twin");
     }
     localDirStr += "/pics/";
     if(!TQFile::exists(localDirStr))
diff --git a/kwin/clients/kwmtheme/kwmtheme.desktop b/kwin/clients/kwmtheme/kwmtheme.desktop
index caa8a6ea8..b34affaa7 100644
--- a/kwin/clients/kwmtheme/kwmtheme.desktop
+++ b/kwin/clients/kwmtheme/kwmtheme.desktop
@@ -78,4 +78,4 @@ Name[xh]=Umxholo we KWM
 Name[zh_CN]=KWM 主题
 Name[zh_TW]=KWM 主題
 Name[zu]=Ingqikithi ye-KWM
-X-KDE-Library=kwin3_kwmtheme
+X-KDE-Library=twin3_kwmtheme
diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp
index 9f51c0edf..5d5e462f7 100644
--- a/kwin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp
@@ -90,7 +90,7 @@ static void create_pixmaps()
     for(int i=0; i < 8; ++i)
     {
         framePixmaps[i] = new TQPixmap(locate("data",
-                                      "kwin/pics/"+config->readEntry(keys[i], " ")));
+                                      "twin/pics/"+config->readEntry(keys[i], " ")));
         if(framePixmaps[i]->isNull())
             kdWarning() << "Unable to load frame pixmap for " << keys[i] << endl;
     }
@@ -111,33 +111,33 @@ static void create_pixmaps()
     maxExtent++;
 
     menuPix = new TQPixmap(locate("data",
-                                 "kwin/pics/"+config->readEntry("menu", " ")));
+                                 "twin/pics/"+config->readEntry("menu", " ")));
     iconifyPix = new TQPixmap(locate("data",
-                                    "kwin/pics/"+config->readEntry("iconify", " ")));
+                                    "twin/pics/"+config->readEntry("iconify", " ")));
     maxPix = new TQPixmap(locate("appdata",
                                 "pics/"+config->readEntry("maximize", " ")));
     minmaxPix = new TQPixmap(locate("data",
-                                   "kwin/pics/"+config->readEntry("maximizedown", " ")));
+                                   "twin/pics/"+config->readEntry("maximizedown", " ")));
     closePix = new TQPixmap(locate("data",
-                                  "kwin/pics/"+config->readEntry("close", " ")));
+                                  "twin/pics/"+config->readEntry("close", " ")));
     pinupPix = new TQPixmap(locate("data",
-                                  "kwin/pics/"+config->readEntry("pinup", " ")));
+                                  "twin/pics/"+config->readEntry("pinup", " ")));
     pindownPix = new TQPixmap(locate("data",
-                                    "kwin/pics/"+config->readEntry("pindown", " ")));
+                                    "twin/pics/"+config->readEntry("pindown", " ")));
     if(menuPix->isNull())                           
-        menuPix->load(locate("data", "kwin/pics/menu.png"));
+        menuPix->load(locate("data", "twin/pics/menu.png"));
     if(iconifyPix->isNull())
-        iconifyPix->load(locate("data", "kwin/pics/iconify.png"));
+        iconifyPix->load(locate("data", "twin/pics/iconify.png"));
     if(maxPix->isNull())
-        maxPix->load(locate("data", "kwin/pics/maximize.png"));
+        maxPix->load(locate("data", "twin/pics/maximize.png"));
     if(minmaxPix->isNull())
-        minmaxPix->load(locate("data", "kwin/pics/maximizedown.png"));
+        minmaxPix->load(locate("data", "twin/pics/maximizedown.png"));
     if(closePix->isNull())
-        closePix->load(locate("data", "kwin/pics/close.png"));
+        closePix->load(locate("data", "twin/pics/close.png"));
     if(pinupPix->isNull())
-        pinupPix->load(locate("data", "kwin/pics/pinup.png"));
+        pinupPix->load(locate("data", "twin/pics/pinup.png"));
     if(pindownPix->isNull())
-        pindownPix->load(locate("data", "kwin/pics/pindown.png"));
+        pindownPix->load(locate("data", "twin/pics/pindown.png"));
     
     tmpStr = config->readEntry("TitleAlignment");
     if(tmpStr == "right")
@@ -186,14 +186,14 @@ static void create_pixmaps()
         tmpStr = config->readEntry("TitlebarPixmapActive", "");
         if(!tmpStr.isEmpty()){
             aTitlePix = new KPixmap;
-            aTitlePix->load(locate("data", "kwin/pics/" + tmpStr));
+            aTitlePix->load(locate("data", "twin/pics/" + tmpStr));
         }
         else
             aTitlePix = NULL;
         tmpStr = config->readEntry("TitlebarPixmapInactive", "");
         if(!tmpStr.isEmpty()){
             iTitlePix = new KPixmap;
-            iTitlePix->load(locate("data", "kwin/pics/" + tmpStr));
+            iTitlePix->load(locate("data", "twin/pics/" + tmpStr));
         }
         else
             iTitlePix = NULL;