diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-02 19:17:20 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-02 19:17:20 +0000 |
commit | a5edd20f0de599dbe7f7f00a184b78ac5156a846 (patch) | |
tree | af263e8b05d3a7ca4cadaae1e4c5b1f739d0a03b /kdesktop | |
parent | c663b6440964f6ac48027143ac9e63298991f9d0 (diff) | |
download | tdebase-a5edd20f0de599dbe7f7f00a184b78ac5156a846.tar.gz tdebase-a5edd20f0de599dbe7f7f00a184b78ac5156a846.zip |
TQt conversion fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1158418 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop')
-rw-r--r-- | kdesktop/bgmanager.h | 4 | ||||
-rw-r--r-- | kdesktop/desktop.h | 8 | ||||
-rw-r--r-- | kdesktop/kfileividesktop.h | 2 | ||||
-rw-r--r-- | kdesktop/krootwm.cc | 16 | ||||
-rw-r--r-- | kdesktop/krootwm.h | 2 | ||||
-rw-r--r-- | kdesktop/lock/autologout.h | 10 | ||||
-rw-r--r-- | kdesktop/lock/infodlg.h | 8 | ||||
-rw-r--r-- | kdesktop/lock/lockdlg.h | 8 | ||||
-rw-r--r-- | kdesktop/lock/querydlg.h | 8 | ||||
-rw-r--r-- | kdesktop/minicli.h | 4 | ||||
-rw-r--r-- | kdesktop/startupid.h | 2 |
11 files changed, 36 insertions, 36 deletions
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index 8396f161a..5b9bf70f1 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -20,8 +20,8 @@ #endif class KConfig; -class QTimer; -class QPixmap; +class TQTimer; +class TQPixmap; class KPopupMenu; class KWinModule; class KPixmap; diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index 0ad57ce7b..d8ec12c69 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -28,13 +28,13 @@ #include <kapplication.h> // for logout parameters class KURL; -class QCloseEvent; -class QDropEvent; -class QPopupMenu; +class TQCloseEvent; +class TQDropEvent; +class TQPopupMenu; class KGlobalAccel; class KWinModule; class KBackgroundManager; -class QTimer; +class TQTimer; class StartupId; class KDIconView; class Minicli; diff --git a/kdesktop/kfileividesktop.h b/kdesktop/kfileividesktop.h index 32166d9d1..129abec07 100644 --- a/kdesktop/kfileividesktop.h +++ b/kdesktop/kfileividesktop.h @@ -36,7 +36,7 @@ #define DITHER_FLAGS (Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::AvoidDither) -class QFont; +class TQFont; class KShadowEngine; /** diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 7e83f6779..58eb78a9f 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -108,7 +108,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop) // The windowList and desktop menus can be part of a menubar (Mac style) // so we create them here - desktopMenu = new QPopupMenu; + desktopMenu = new TQPopupMenu; windowListMenu = new KWindowListMenu; connect( windowListMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotWindowListAboutToShow() ) ); @@ -287,7 +287,7 @@ void KRootWm::buildMenus() if (m_bDesktopEnabled && m_actionCollection->action("realign")) { - pArrangeMenu = new QPopupMenu; + pArrangeMenu = new TQPopupMenu; m_actionCollection->action("sort_ncs")->plug( pArrangeMenu ); m_actionCollection->action("sort_nci")->plug( pArrangeMenu ); m_actionCollection->action("sort_size")->plug( pArrangeMenu ); @@ -296,7 +296,7 @@ void KRootWm::buildMenus() pArrangeMenu->insertSeparator(); m_actionCollection->action("sort_directoriesfirst")->plug( pArrangeMenu ); - pLineupMenu = new QPopupMenu; + pLineupMenu = new TQPopupMenu; m_actionCollection->action( "lineupHoriz" )->plug( pLineupMenu ); m_actionCollection->action( "lineupVert" )->plug( pLineupMenu ); pLineupMenu->insertSeparator(); @@ -306,14 +306,14 @@ void KRootWm::buildMenus() sessionsMenu = 0; if (m_actionCollection->action("newsession")) { - sessionsMenu = new QPopupMenu; + sessionsMenu = new TQPopupMenu; connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) ); connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) ); } if (menuBar) { bool needSeparator = false; - file = new QPopupMenu; + file = new TQPopupMenu; action = m_actionCollection->action("exec"); if (action) @@ -330,7 +330,7 @@ void KRootWm::buildMenus() if (action) action->plug( file ); - desk = new QPopupMenu; + desk = new TQPopupMenu; if (m_bDesktopEnabled) { @@ -415,7 +415,7 @@ void KRootWm::buildMenus() if (m_bDesktopEnabled && m_actionCollection->action("realign")) { - TQPopupMenu* pIconOperationsMenu = new QPopupMenu; + TQPopupMenu* pIconOperationsMenu = new TQPopupMenu; pIconOperationsMenu->insertItem(i18n("Sort Icons"), pArrangeMenu); pIconOperationsMenu->insertSeparator(); @@ -430,7 +430,7 @@ void KRootWm::buildMenus() desktopMenu->insertItem(SmallIconSet("icons"), i18n("Icons"), pIconOperationsMenu); } - TQPopupMenu* pWindowOperationsMenu = new QPopupMenu; + TQPopupMenu* pWindowOperationsMenu = new TQPopupMenu; m_actionCollection->action("cascade")->plug( pWindowOperationsMenu ); m_actionCollection->action("unclutter")->plug( pWindowOperationsMenu ); desktopMenu->insertItem(SmallIconSet("window_list"), i18n("Windows"), pWindowOperationsMenu); diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h index 8bbf83817..960d0e53c 100644 --- a/kdesktop/krootwm.h +++ b/kdesktop/krootwm.h @@ -33,7 +33,7 @@ typedef XID Window; class KMenuBar; class KDesktop; -class QPopupMenu; +class TQPopupMenu; class KCMultiDialog; class KNewMenu; class KWinModule; diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h index 20c7afc6c..f40ac5f0d 100644 --- a/kdesktop/lock/autologout.h +++ b/kdesktop/lock/autologout.h @@ -14,11 +14,11 @@ #include <tqlayout.h> class LockProcess; -class QFrame; -class QGridLayout; -class QLabel; -class QDialog; -class QProgressBar; +class TQFrame; +class TQGridLayout; +class TQLabel; +class TQDialog; +class TQProgressBar; class AutoLogout : public QDialog { diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h index b0e98150f..df446f592 100644 --- a/kdesktop/lock/infodlg.h +++ b/kdesktop/lock/infodlg.h @@ -11,11 +11,11 @@ #include <tqdialog.h> #include <tqstringlist.h> -class QFrame; -class QGridLayout; -class QLabel; +class TQFrame; +class TQGridLayout; +class TQLabel; class KPushButton; -class QListView; +class TQListView; //=========================================================================== // diff --git a/kdesktop/lock/lockdlg.h b/kdesktop/lock/lockdlg.h index 592acd7ce..6ef33c51e 100644 --- a/kdesktop/lock/lockdlg.h +++ b/kdesktop/lock/lockdlg.h @@ -16,11 +16,11 @@ struct GreeterPluginHandle; class LockProcess; -class QFrame; -class QGridLayout; -class QLabel; +class TQFrame; +class TQGridLayout; +class TQLabel; class KPushButton; -class QListView; +class TQListView; //=========================================================================== // diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h index d3f8f4be7..c9175b4ea 100644 --- a/kdesktop/lock/querydlg.h +++ b/kdesktop/lock/querydlg.h @@ -13,11 +13,11 @@ #include <kpassdlg.h> -class QFrame; -class QGridLayout; -class QLabel; +class TQFrame; +class TQGridLayout; +class TQLabel; class KPushButton; -class QListView; +class TQListView; //=========================================================================== // diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h index f70035464..ddbe868c0 100644 --- a/kdesktop/minicli.h +++ b/kdesktop/minicli.h @@ -39,8 +39,8 @@ #include <kurlcompletion.h> -class QTimer; -class QWidget; +class TQTimer; +class TQWidget; class MinicliDlgUI; class KURIFilterData; diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h index 941e4165c..d54b72730 100644 --- a/kdesktop/startupid.h +++ b/kdesktop/startupid.h @@ -29,7 +29,7 @@ #include <tqmap.h> #include <kstartupinfo.h> -class QStyle; +class TQStyle; class StartupId : public QWidget |