Rename a number of classes to enhance compatibility with KDE4

1 files changed, 61 insertions, 61 deletions

diff --git a/src/bnpview.h b/src/bnpview.h
index 34e3042..0fabb22 100644
--- a/src/bnpview.h
+++ b/src/bnpview.h
@@ -36,10 +36,10 @@
 class TQWidgetStack;
 class TQDomDocument;
 class TQDomElement;
-class KToggleAction;
+class TDEToggleAction;
 class KPassivePopup;
 class TQPopupMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 class KTar;
 
 class DesktopColorPicker;
@@ -61,7 +61,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 	public:
 	/// CONSTRUCTOR AND DESTRUCTOR:
 		BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient,
-				KActionCollection *actionCollection, BasketStatusBar *bar);
+				TDEActionCollection *actionCollection, BasketStatusBar *bar);
 		~BNPView();
 	/// MANAGE CONFIGURATION EVENTS!:
 		void setTreePlacement(bool onLeft);
@@ -97,7 +97,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void save(TQListViewItem *firstItem, TQDomDocument &document, TQDomElement &parentElement);
 		void saveSubHierarchy(TQListViewItem *item, TQDomDocument &document, TQDomElement &parentElement, bool recursive);
 		void load();
-		void load(KListView *listView, TQListViewItem *item, const TQDomElement &baskets);
+		void load(TDEListView *listView, TQListViewItem *item, const TQDomElement &baskets);
 		void loadNewBasket(const TQString &folderName, const TQDomElement &properties, Basket *parent);
 		void goToPreviousBasket();
 		void goToNextBasket();
@@ -213,65 +213,65 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void showGlobalShortcutsSettingsDialog();
 
 	public:
-		KAction       *m_actEditNote;
-		KAction       *m_actOpenNote;
-		KAction       *m_actPaste;
-		KAction       *m_actGrabScreenshot;
-		KAction       *m_actColorPicker;
-		KAction       *m_actLockBasket;
-		KAction       *m_actPassBasket;
-		KAction       *actNewBasket;
-		KAction       *actNewSubBasket;
-		KAction       *actNewSiblingBasket;
-		KAction       *m_actHideWindow;
-		KAction       *m_actExportToHtml;
-		KAction       *m_actPropBasket;
-		KAction       *m_actDelBasket;
-		KToggleAction *m_actFilterAllBaskets;
+		TDEAction       *m_actEditNote;
+		TDEAction       *m_actOpenNote;
+		TDEAction       *m_actPaste;
+		TDEAction       *m_actGrabScreenshot;
+		TDEAction       *m_actColorPicker;
+		TDEAction       *m_actLockBasket;
+		TDEAction       *m_actPassBasket;
+		TDEAction       *actNewBasket;
+		TDEAction       *actNewSubBasket;
+		TDEAction       *actNewSiblingBasket;
+		TDEAction       *m_actHideWindow;
+		TDEAction       *m_actExportToHtml;
+		TDEAction       *m_actPropBasket;
+		TDEAction       *m_actDelBasket;
+		TDEToggleAction *m_actFilterAllBaskets;
 
 	private:
 		// Basket actions:
-		KAction       *m_actSaveAsArchive;
-		KAction       *m_actOpenArchive;
+		TDEAction       *m_actSaveAsArchive;
+		TDEAction       *m_actOpenArchive;
 		// Notes actions :
-		KAction       *m_actOpenNoteWith;
-		KAction       *m_actSaveNoteAs;
-		KAction       *m_actGroup;
-		KAction       *m_actUngroup;
-		KAction       *m_actMoveOnTop;
-		KAction       *m_actMoveNoteUp;
-		KAction       *m_actMoveNoteDown;
-		KAction       *m_actMoveOnBottom;
+		TDEAction       *m_actOpenNoteWith;
+		TDEAction       *m_actSaveNoteAs;
+		TDEAction       *m_actGroup;
+		TDEAction       *m_actUngroup;
+		TDEAction       *m_actMoveOnTop;
+		TDEAction       *m_actMoveNoteUp;
+		TDEAction       *m_actMoveNoteDown;
+		TDEAction       *m_actMoveOnBottom;
 		// Edit actions :
-		KAction       *m_actUndo;
-		KAction       *m_actRedo;
-		KAction       *m_actCutNote;
-		KAction       *m_actCopyNote;
-		KAction       *m_actDelNote;
-		KAction       *m_actSelectAll;
-		KAction       *m_actUnselectAll;
-		KAction       *m_actInvertSelection;
+		TDEAction       *m_actUndo;
+		TDEAction       *m_actRedo;
+		TDEAction       *m_actCutNote;
+		TDEAction       *m_actCopyNote;
+		TDEAction       *m_actDelNote;
+		TDEAction       *m_actSelectAll;
+		TDEAction       *m_actUnselectAll;
+		TDEAction       *m_actInvertSelection;
 		// Insert actions :
-//		KAction       *m_actInsertText;
-		KAction       *m_actInsertHtml;
-		KAction       *m_actInsertLink;
-		KAction       *m_actInsertImage;
-		KAction       *m_actInsertColor;
-		KAction       *m_actImportKMenu;
-		KAction       *m_actInsertLauncher;
-		KAction       *m_actImportIcon;
-		KAction       *m_actLoadFile;
-		TQPtrList<KAction> m_insertActions;
+//		TDEAction       *m_actInsertText;
+		TDEAction       *m_actInsertHtml;
+		TDEAction       *m_actInsertLink;
+		TDEAction       *m_actInsertImage;
+		TDEAction       *m_actInsertColor;
+		TDEAction       *m_actImportKMenu;
+		TDEAction       *m_actInsertLauncher;
+		TDEAction       *m_actImportIcon;
+		TDEAction       *m_actLoadFile;
+		TQPtrList<TDEAction> m_insertActions;
 		// Basket actions :
-		KToggleAction *m_actShowFilter;
-		KAction       *m_actResetFilter;
+		TDEToggleAction *m_actShowFilter;
+		TDEAction       *m_actResetFilter;
 		// Go actions :
-		KAction       *m_actPreviousBasket;
-		KAction       *m_actNextBasket;
-		KAction       *m_actFoldBasket;
-		KAction       *m_actExpandBasket;
-//		KAction       *m_convertTexts; // FOR_BETA_PURPOSE
-		KAction       *actConfigGlobalShortcuts;
+		TDEAction       *m_actPreviousBasket;
+		TDEAction       *m_actNextBasket;
+		TDEAction       *m_actFoldBasket;
+		TDEAction       *m_actExpandBasket;
+//		TDEAction       *m_convertTexts; // FOR_BETA_PURPOSE
+		TDEAction       *actConfigGlobalShortcuts;
 
 		void setupActions();
 		void setupGlobalShortcuts();
@@ -300,10 +300,10 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void setStatusBarHint(const TQString&);
 		void setUnsavedStatus(bool isUnsaved);
 		void setActive(bool active = true);
-		KActionCollection *actionCollection() { return m_actionCollection; };
+		TDEActionCollection *actionCollection() { return m_actionCollection; };
 
 		void populateTagsMenu();
-		void populateTagsMenu(KPopupMenu &menu, Note *referenceNote);
+		void populateTagsMenu(TDEPopupMenu &menu, Note *referenceNote);
 		void connectTagsMenu();
 		void disconnectTagsMenu();
 		void disconnectTagsMenuDelayed();
@@ -311,12 +311,12 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void showEvent(TQShowEvent*);
 		void hideEvent(TQHideEvent*);
 	private:
-		KPopupMenu *m_lastOpenedTagsMenu;
+		TDEPopupMenu *m_lastOpenedTagsMenu;
 
 	private slots:
 		void slotPressed(TQListViewItem *item, const TQPoint &/*pos*/ = TQPoint(), int /*column*/ = 0);
 		void needSave(TQListViewItem*);
-		void slotContextMenu(KListView *listView, TQListViewItem *item, const TQPoint &pos);
+		void slotContextMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &pos);
 		void slotMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int column);
 		void slotShowProperties(TQListViewItem *item, const TQPoint&, int);
 		void initialize();
@@ -332,7 +332,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void leaveEvent(TQEvent*);
 
 	private:
-		KListView    *m_tree;
+		TDEListView    *m_tree;
 		TQWidgetStack *m_stack;
 		bool          m_loading;
 		bool          m_newBasketPopup;
@@ -345,7 +345,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		NoteSelection *m_passiveDroppedSelection;
 		KPassivePopup *m_passivePopup;
 		static const int c_delayTooltipTime;
-		KActionCollection *m_actionCollection;
+		TDEActionCollection *m_actionCollection;
 		KXMLGUIClient *m_guiClient;
 		BasketStatusBar *m_statusbar;
 		TQTimer             *m_tryHideTimer;