Rename a number of classes to enhance compatibility with KDE4

kiosktool/componentPage_ui.ui

@@ -139,7 +139,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="KListView" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="2">
             <column>
                 <property name="text">
                     <string>Restriction</string>

kiosktool/kcms/autostart/kcmautostart.cpp

@@ -68,7 +68,7 @@ AutoStartConfig::AutoStartConfig(TQWidget* parent, const char* name, const TQStr
                 "Be careful with deactivation of unknown services."));
     lay->addWidget( gb );
 
-    _lvStartup = new KListView( gb );
+    _lvStartup = new TDEListView( gb );
     _lvStartup->addColumn(i18n("Use"));
     _lvStartup->addColumn(i18n("Service"));
     _lvStartup->addColumn(i18n("Description"));

kiosktool/kcms/autostart/kcmautostart.h

@@ -22,7 +22,7 @@
 #include <tqlistview.h>
 #include <tdecmodule.h>
 
-class KListView;
+class TDEListView;
 class TQStringList;
 class TQPushButton;
 
@@ -48,7 +48,7 @@ protected slots:
         void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b);
 
 private:
-	KListView *_lvStartup;
+	TDEListView *_lvStartup;
 };
 
 class CheckListItem : public TQObject, public TQCheckListItem

kiosktool/kioskdata.cpp

@@ -44,7 +44,7 @@ static TQDict<TQString> *readStdActionCaptions()
   for(int i = KStdAction::ActionNone; true;)
   {
      i++;
-     KAction *action = KStdAction::create((KStdAction::StdAction) i, 0, 0, 0, 0);
+     TDEAction *action = KStdAction::create((KStdAction::StdAction) i, 0, 0, 0, 0);
      if (!action)
        break;
 

kiosktool/kioskgui.cpp

@@ -59,7 +59,7 @@
 #include "kiosksync.h"
 
 KioskGui::KioskGui()
-    : KMainWindow( 0, "kioskgui" ), m_profileSelectionPage(0),
+    : TDEMainWindow( 0, "kioskgui" ), m_profileSelectionPage(0),
     m_componentSelectionPage(0), m_componentPage(0), m_profileAssignPage(0),
     m_profilePropsPage(0), m_data(0),
     m_activePage(0), m_profile(0), m_componentData(0)
@@ -72,7 +72,7 @@ KioskGui::KioskGui()
 
     updateBackground();
 
-    // tell the KMainWindow that this is indeed the main widget
+    // tell the TDEMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
 
     setWidgetBackground(m_view);
@@ -167,8 +167,8 @@ void KioskGui::setupActions()
 //    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
 //    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
     KStdAction::preferences(this, TQT_SLOT(slotConfig()), actionCollection());
-    m_uploadAction = new KAction(i18n("Upload &All Profiles"), TQString(), 0, this, TQT_SLOT(uploadAllProfiles()), actionCollection(), "upload_all");
-    m_backgroundAction = new KToggleAction(i18n("Background Graphics"), TQString(), 0, this, TQT_SLOT(slotUpdateBackground()), actionCollection(), "show_background");
+    m_uploadAction = new TDEAction(i18n("Upload &All Profiles"), TQString(), 0, this, TQT_SLOT(uploadAllProfiles()), actionCollection(), "upload_all");
+    m_backgroundAction = new TDEToggleAction(i18n("Background Graphics"), TQString(), 0, this, TQT_SLOT(slotUpdateBackground()), actionCollection(), "show_background");
 
     updateActions();
 }

kiosktool/kioskgui.h

@@ -32,10 +32,10 @@ class PageWidget;
 class KioskData;
 class KioskRun;
 class ComponentData;
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 
-class KioskGui : public KMainWindow
+class KioskGui : public TDEMainWindow
 {
    Q_OBJECT
   
@@ -103,8 +103,8 @@ protected:
    TQString m_profile;
    TQString m_component;
    ComponentData * m_componentData;
-   KAction *m_uploadAction;
-   KToggleAction *m_backgroundAction;
+   TDEAction *m_uploadAction;
+   TDEToggleAction *m_backgroundAction;
 };
 
 #endif

kiosktool/pageWidget.cpp

@@ -52,7 +52,7 @@ PageWidget::~PageWidget()
 }
 
 void
-PageWidget::fillActionList(KListView *listView, ComponentData *componentData)
+PageWidget::fillActionList(TDEListView *listView, ComponentData *componentData)
 {
   int index = 0;
   for(ComponentAction *action = componentData->actions.first(); action;
@@ -199,7 +199,7 @@ PageWidget::saveActionListItem(ComponentAction *action, bool b)
 }
 
 bool
-PageWidget::saveActionListChanges(KListView *listView)
+PageWidget::saveActionListChanges(TDEListView *listView)
 {
   for(ComponentActionItem *item = static_cast<ComponentActionItem*>(listView->firstChild()); 
       item; item = static_cast<ComponentActionItem*>(item->nextSibling()))

kiosktool/pageWidget.h

@@ -46,8 +46,8 @@ public:
 
    TQWidget *widget() const { return m_widget; }
 
-   void fillActionList(KListView *listView, ComponentData *componentData);
-   bool saveActionListChanges(KListView *listView);
+   void fillActionList(TDEListView *listView, ComponentData *componentData);
+   bool saveActionListChanges(TDEListView *listView);
 
    virtual void load() = 0;
    virtual bool save() = 0;

kiosktool/profileSelectionPage_ui.ui

@@ -39,7 +39,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="KListView" row="2" column="1" rowspan="2" colspan="1">
+        <widget class="TDEListView" row="2" column="1" rowspan="2" colspan="1">
             <column>
                 <property name="text">
                     <string>Profile</string>

kiosktool/userManagement_ui.ui

@@ -65,7 +65,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>Group</string>
@@ -177,7 +177,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>User</string>