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
---
 kdeprint/kmmanager.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kdeprint/kmmanager.h')

diff --git a/kdeprint/kmmanager.h b/kdeprint/kmmanager.h
index 304245730..8826273a0 100644
--- a/kdeprint/kmmanager.h
+++ b/kdeprint/kmmanager.h
@@ -45,7 +45,7 @@ class PrinterFilter;
  * if you're a KDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class KDEPRINT_EXPORT KMManager : public TQObject
+class KDEPRINT_EXPORT KMManager : public QObject
 {
 	Q_OBJECT
 
@@ -97,7 +97,7 @@ public:
 	bool startPrinter(const TQString& name, bool state);
 	bool completePrinter(const TQString& name);
 	bool setDefaultPrinter(const TQString& name);
-	int printerOperationMask() const 	{ return m_printeroperationtqmask; }
+	int printerOperationMask() const 	{ return m_printeroperationmask; }
 	int addPrinterWizard(TQWidget *parent = 0);
 
 	// special printer management functions
@@ -105,7 +105,7 @@ public:
 	bool removeSpecialPrinter(KMPrinter *p);
 
 	// printer listing functions
-	KMPrinter* tqfindPrinter(const TQString& name);
+	KMPrinter* findPrinter(const TQString& name);
 	TQPtrList<KMPrinter>* printerList(bool reload = true);
 	TQPtrList<KMPrinter>* printerListComplete(bool reload = true);
 	KMPrinter* defaultPrinter();
@@ -129,7 +129,7 @@ public:
 	virtual TQString stateInformation();
 
 	// server functions
-	int serverOperationMask() const 	{ return m_serveroperationtqmask; }
+	int serverOperationMask() const 	{ return m_serveroperationmask; }
 	virtual bool restartServer();
 	virtual bool configureServer(TQWidget *parent = 0);
 	virtual TQStringList detectLocalPrinters();
@@ -161,8 +161,8 @@ protected:
 	bool uncompressFile(const TQString& srcname, TQString& destname);
 	bool notImplemented();
 	void setHasManagement(bool on)		{ m_hasmanagement = on; }
-	void setPrinterOperationMask(int m)	{ m_printeroperationtqmask = m; }
-	void setServerOperationMask(int m)	{ m_serveroperationtqmask = m; }
+	void setPrinterOperationMask(int m)	{ m_printeroperationmask = m; }
+	void setServerOperationMask(int m)	{ m_serveroperationmask = m; }
 	TQString testPage();
 	void discardAllPrinters(bool);
 	void setUpdatePossible( bool );
@@ -172,8 +172,8 @@ protected:
 	QString			m_errormsg;
 	KMPrinterList		m_printers, m_fprinters;	// filtered printers
 	bool 			m_hasmanagement;
-	int			m_printeroperationtqmask;
-	int 			m_serveroperationtqmask;
+	int			m_printeroperationmask;
+	int 			m_serveroperationmask;
 	KMSpecialManager	*m_specialmgr;
 	KMVirtualManager	*m_virtualmgr;
 	PrinterFilter	*m_printerfilter;
-- 
cgit v1.2.1