From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 03:45:53 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
 prime time Work will continue as always

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kded/vfolder_menu.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kded/vfolder_menu.h')

diff --git a/kded/vfolder_menu.h b/kded/vfolder_menu.h
index 83d6dab64..ce7183056 100644
--- a/kded/vfolder_menu.h
+++ b/kded/vfolder_menu.h
@@ -29,7 +29,7 @@
 
 #include <kservice.h>
 
-class VFolderMenu : public TQObject
+class VFolderMenu : public QObject
 {
   Q_OBJECT
 public:
@@ -46,9 +46,9 @@ public:
      TQDict<KService> items;
      TQDict<KService> excludeItems; // Needed when merging due to Move.
      TQDomElement defaultLayoutNode;
-     TQDomElement tqlayoutNode;
+     TQDomElement layoutNode;
      bool isDeleted;
-     TQStringList tqlayoutList;
+     TQStringList layoutList;
      appsInfo *apps_info;
   };
 
@@ -56,7 +56,7 @@ public:
   ~VFolderMenu();
 
   /**
-   * Parses VFolder menu defintion and generates a menu tqlayout.
+   * Parses VFolder menu defintion and generates a menu layout.
    * The newService signals is used as callback to load
    * a specific service description.
    *
@@ -148,12 +148,12 @@ private:
   /**
    * Lookup application by relative path
    */
-  KService *tqfindApplication(const TQString &relPath);
+  KService *findApplication(const TQString &relPath);
 
   /**
    * Lookup applications by category
    */
-  TQPtrList<KService::List> tqfindCategory(const TQString &category);
+  TQPtrList<KService::List> findCategory(const TQString &category);
   
   /**
    * Add new application
@@ -253,7 +253,7 @@ private:
   void processKDELegacyDirs();
   void processLegacyDir(const TQString &dir, const TQString &relDir, const TQString &prefix);
   void processMenu(TQDomElement &docElem, int pass);
-  void tqlayoutMenu(VFolderMenu::SubMenu *menu, TQStringList defaultLayout);
+  void layoutMenu(VFolderMenu::SubMenu *menu, TQStringList defaultLayout);
   void processCondition(TQDomElement &docElem, TQDict<KService> *items);
 
   void initDirs();
-- 
cgit v1.2.1