TQt4 port basket

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/basket@1232416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 53 insertions, 52 deletions

diff --git a/src/bnpview.h b/src/bnpview.h
index b7e99ef..f62441d 100644
--- a/src/bnpview.h
+++ b/src/bnpview.h
@@ -23,22 +23,22 @@
 
 #include <klistview.h>
 #include <kxmlguiclient.h>
-#include <qtimer.h>
-#include <qclipboard.h>
-#include <qsplitter.h>
-#include <qlistview.h>
+#include <tqtimer.h>
+#include <tqclipboard.h>
+#include <tqsplitter.h>
+#include <tqlistview.h>
 #include <dcopref.h>
 #include "global.h"
 #include "basketdcopiface.h"
 
  /// NEW:
 
-class QWidgetStack;
-class QDomDocument;
-class QDomElement;
+class TQWidgetStack;
+class TQDomDocument;
+class TQDomElement;
 class KToggleAction;
 class KPassivePopup;
-class QPopupMenu;
+class TQPopupMenu;
 class KPopupMenu;
 class KTar;
 
@@ -54,38 +54,39 @@ class Tag;
 class State;
 class Note;
 
-class BNPView : public QSplitter, virtual public BasketDcopInterface
+class BNPView : public TQSplitter, virtual public BasketDcopInterface
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 	/// CONSTRUCTOR AND DESTRUCTOR:
-		BNPView(QWidget *parent, const char *name, KXMLGUIClient *aGUIClient,
+		BNPView(TQWidget *tqparent, const char *name, KXMLGUIClient *aGUIClient,
 				KActionCollection *actionCollection, BasketStatusBar *bar);
 		~BNPView();
 	/// MANAGE CONFIGURATION EVENTS!:
 		void setTreePlacement(bool onLeft);
-		void relayoutAllBaskets();
+		void retqlayoutAllBaskets();
 		void recomputeAllStyles();
-		void removedStates(const QValueList<State*> &deletedStates);
+		void removedStates(const TQValueList<State*> &deletedStates);
 		void linkLookChanged();
 		void filterPlacementChanged(bool onTop);
 	/// MANAGE BASKETS:
 		BasketListViewItem* listViewItemForBasket(Basket *basket);
 		Basket* currentBasket();
-		Basket* parentBasketOf(Basket *basket);
+		Basket* tqparentBasketOf(Basket *basket);
 		void setCurrentBasket(Basket *basket);
 		void removeBasket(Basket *basket);
 	/// For NewBasketDialog (and later some other classes):
-		QListViewItem* firstListViewItem();
+		TQListViewItem* firstListViewItem();
 		///
 		BasketListViewItem* lastListViewItem();
-		int basketCount(QListViewItem *parent = 0);
+		int basketCount(TQListViewItem *tqparent = 0);
 		bool canFold();
 		bool canExpand();
 		void enableActions();
 
 	private:
-		QDomElement basketElement(QListViewItem *item, QDomDocument &document, QDomElement &parentElement);
+		TQDomElement basketElement(TQListViewItem *item, TQDomDocument &document, TQDomElement &tqparentElement);
 	public slots:
 		void countsChanged(Basket *basket);
 		void notesStateChanged();
@@ -93,11 +94,11 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 
 		void updateBasketListViewItem(Basket *basket);
 		void save();
-		void save(QListViewItem *firstItem, QDomDocument &document, QDomElement &parentElement);
-		void saveSubHierarchy(QListViewItem *item, QDomDocument &document, QDomElement &parentElement, bool recursive);
+		void save(TQListViewItem *firstItem, TQDomDocument &document, TQDomElement &tqparentElement);
+		void saveSubHierarchy(TQListViewItem *item, TQDomDocument &document, TQDomElement &tqparentElement, bool recursive);
 		void load();
-		void load(KListView *listView, QListViewItem *item, const QDomElement &baskets);
-		void loadNewBasket(const QString &folderName, const QDomElement &properties, Basket *parent);
+		void load(KListView *listView, TQListViewItem *item, const TQDomElement &baskets);
+		void loadNewBasket(const TQString &folderName, const TQDomElement &properties, Basket *tqparent);
 		void goToPreviousBasket();
 		void goToNextBasket();
 		void foldBasket();
@@ -141,7 +142,7 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 
 		void slotColorFromScreen(bool global = false);
 		void slotColorFromScreenGlobal();
-		void colorPicked(const QColor &color);
+		void colorPicked(const TQColor &color);
 		void colorPickingCanceled();
 		void slotConvertTexts();
 
@@ -152,11 +153,11 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 		void addNoteLink();
 		void addNoteColor();
 		/** Passive Popups for Global Actions */
-		void showPassiveDropped(const QString &title);
+		void showPassiveDropped(const TQString &title);
 		void showPassiveDroppedDelayed(); // Do showPassiveDropped(), but delayed
 		void showPassiveContent(bool forceShow = false);
 		void showPassiveContentForced();
-		void showPassiveImpossible(const QString &message);
+		void showPassiveImpossible(const TQString &message);
 		void showPassiveLoading(Basket *basket);
 		// For GUI :
 		void setFiltering(bool filtering);
@@ -166,17 +167,17 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 		void globalPasteInCurrentBasket();
 		void pasteInCurrentBasket();
 		void pasteSelInCurrentBasket();
-		void pasteToBasket(int index, QClipboard::Mode mode = QClipboard::Clipboard);
+		void pasteToBasket(int index, TQClipboard::Mode mode = TQClipboard::Clipboard);
 		void showHideFilterBar(bool show, bool switchFocus = true);
 		/** Insert **/
 		void insertEmpty(int type);
 		void insertWizard(int type);
 		void grabScreenshot(bool global = false);
 		void grabScreenshotGlobal();
-		void screenshotGrabbed(const QPixmap &pixmap);
+		void screenshotGrabbed(const TQPixmap &pixmap);
 		/** Basket */
 		void askNewBasket();
-		void askNewBasket(Basket *parent, Basket *pickProperties);
+		void askNewBasket(Basket *tqparent, Basket *pickProperties);
 		void askNewSubBasket();
 		void askNewSiblingBasket();
 		void aboutToHideNewBasketPopup();
@@ -197,7 +198,7 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 		void timeoutHide();
 
 	public:
-		static QString s_fileToOpen;
+		static TQString s_fileToOpen;
 
 	public slots:
 		void addWelcomeBaskets();
@@ -260,7 +261,7 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 		KAction       *m_actInsertLauncher;
 		KAction       *m_actImportIcon;
 		KAction       *m_actLoadFile;
-		QPtrList<KAction> m_insertActions;
+		TQPtrList<KAction> m_insertActions;
 		// Basket actions :
 		KToggleAction *m_actShowFilter;
 		KAction       *m_actResetFilter;
@@ -277,11 +278,11 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 		DecoratedBasket* currentDecoratedBasket();
 
 	public:
-		Basket* loadBasket(const QString &folderName); // Public only for class Archive
-		BasketListViewItem* appendBasket(Basket *basket, QListViewItem *parentItem); // Public only for class Archive
+		Basket* loadBasket(const TQString &folderName); // Public only for class Archive
+		BasketListViewItem* appendBasket(Basket *basket, TQListViewItem *tqparentItem); // Public only for class Archive
 
-		Basket* basketForFolderName(const QString &folderName);
-		QPopupMenu* popupMenu(const QString &menuName);
+		Basket* basketForFolderName(const TQString &folderName);
+		TQPopupMenu* popupMenu(const TQString &menuName);
 		bool isPart();
 		bool isMainWindowActive();
 		void showMainWindow();
@@ -291,13 +292,13 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 		virtual void handleCommandLine();
 
 	public slots:
-		void setCaption(QString s);
+		void setCaption(TQString s);
 		void updateStatusBarHint();
-		void setSelectionStatus(QString s);
-		void setLockStatus(bool isLocked);
-		void postStatusbarMessage(const QString&);
-		void setStatusBarHint(const QString&);
-		void setUnsavedStatus(bool isUnsaved);
+		void setSelectiontqStatus(TQString s);
+		void setLocktqStatus(bool isLocked);
+		void postStatusbarMessage(const TQString&);
+		void setStatusBarHint(const TQString&);
+		void setUnsavedtqStatus(bool isUnsaved);
 		void setActive(bool active = true);
 		KActionCollection *actionCollection() { return m_actionCollection; };
 
@@ -307,32 +308,32 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 		void disconnectTagsMenu();
 		void disconnectTagsMenuDelayed();
 	protected:
-		void showEvent(QShowEvent*);
-		void hideEvent(QHideEvent*);
+		void showEvent(TQShowEvent*);
+		void hideEvent(TQHideEvent*);
 	private:
 		KPopupMenu *m_lastOpenedTagsMenu;
 
 	private slots:
-		void slotPressed(QListViewItem *item, const QPoint &/*pos*/ = QPoint(), int /*column*/ = 0);
-		void needSave(QListViewItem*);
-		void slotContextMenu(KListView *listView, QListViewItem *item, const QPoint &pos);
-		void slotMouseButtonPressed(int button, QListViewItem *item, const QPoint &pos, int column);
-		void slotShowProperties(QListViewItem *item, const QPoint&, int);
+		void slotPressed(TQListViewItem *item, const TQPoint &/*pos*/ = TQPoint(), int /*column*/ = 0);
+		void needSave(TQListViewItem*);
+		void slotContextMenu(KListView *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();
 
 	signals:
 		void basketNumberChanged(int number);
 		void basketChanged();
-		void setWindowCaption(const QString &s);
+		void setWindowCaption(const TQString &s);
 		void showPart();
 
 	protected:
-		void enterEvent(QEvent*);
-		void leaveEvent(QEvent*);
+		void enterEvent(TQEvent*);
+		void leaveEvent(TQEvent*);
 
 	private:
 		KListView    *m_tree;
-		QWidgetStack *m_stack;
+		TQWidgetStack *m_stack;
 		bool          m_loading;
 		bool          m_newBasketPopup;
 		bool          m_firstShow;
@@ -340,15 +341,15 @@ class BNPView : public QSplitter, virtual public BasketDcopInterface
 		bool                m_colorPickWasShown;
 		bool                m_colorPickWasGlobal;
 		RegionGrabber      *m_regionGrabber;
-		QString m_passiveDroppedTitle;
+		TQString m_passiveDroppedTitle;
 		NoteSelection *m_passiveDroppedSelection;
 		KPassivePopup *m_passivePopup;
 		static const int c_delayTooltipTime;
 		KActionCollection *m_actionCollection;
 		KXMLGUIClient *m_guiClient;
 		BasketStatusBar *m_statusbar;
-		QTimer             *m_tryHideTimer;
-		QTimer             *m_hideTimer;
+		TQTimer             *m_tryHideTimer;
+		TQTimer             *m_hideTimer;
 };
 
 #endif // BNPVIEW_H