diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
commit | c663b6440964f6ac48027143ac9e63298991f9d0 (patch) | |
tree | 6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /kicker/applets/taskbar | |
parent | a061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff) | |
download | tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets/taskbar')
-rw-r--r-- | kicker/applets/taskbar/taskbarapplet.cpp | 22 | ||||
-rw-r--r-- | kicker/applets/taskbar/taskbarapplet.h | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index dc3428bf8..55e5d113f 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlayout.h> -#include <qpalette.h> +#include <tqlayout.h> +#include <tqpalette.h> #include <kapplication.h> #include <kglobal.h> @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString& configFile ) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { // FIXME: what about two taskbars? perhaps this should be inserted just once KGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); @@ -51,15 +51,15 @@ extern "C" } } -TaskbarApplet::TaskbarApplet( const QString& configFile, Type type, int actions, - QWidget *parent, const char *name ) +TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions, + TQWidget *parent, const char *name ) : KPanelApplet( configFile, type, actions, parent, name ) { setBackgroundOrigin( AncestorOrigin ); - QHBoxLayout* layout = new QHBoxLayout( this ); + TQHBoxLayout* layout = new TQHBoxLayout( this ); container = new TaskBarContainer( false, this ); container->setBackgroundOrigin( AncestorOrigin ); - connect(container, SIGNAL(containerCountChanged()), this, SIGNAL(updateLayout())); + connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout())); layout->addWidget( container, 1 ); container->popupDirectionChange(popupDirection()); } @@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->sizeHint(d, QSize(200, h)).width(); + return container->sizeHint(d, TQSize(200, h)).width(); } int TaskbarApplet::heightForWidth(int w) const @@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->sizeHint(d, QSize(w, 200)).height(); + return container->sizeHint(d, TQSize(w, 200)).height(); } void TaskbarApplet::preferences() @@ -115,12 +115,12 @@ void TaskbarApplet::popupDirectionChange( Direction d ) container->popupDirectionChange( d ); } -void TaskbarApplet::moveEvent(QMoveEvent *) +void TaskbarApplet::moveEvent(TQMoveEvent *) { container->setBackground(); } -void TaskbarApplet::paletteChange(const QPalette &) +void TaskbarApplet::paletteChange(const TQPalette &) { container->setBackground(); } diff --git a/kicker/applets/taskbar/taskbarapplet.h b/kicker/applets/taskbar/taskbarapplet.h index f0842baca..69ef5eda1 100644 --- a/kicker/applets/taskbar/taskbarapplet.h +++ b/kicker/applets/taskbar/taskbarapplet.h @@ -34,8 +34,8 @@ class TaskbarApplet : public KPanelApplet Q_OBJECT public: - TaskbarApplet( const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0 ); + TaskbarApplet( const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0 ); ~TaskbarApplet(); int widthForHeight( int h ) const; @@ -44,10 +44,10 @@ public: void preferences(); protected: - void moveEvent(QMoveEvent *); + void moveEvent(TQMoveEvent *); void popupDirectionChange( Direction ); void orientationChange( Orientation ); - void paletteChange(const QPalette &); + void paletteChange(const TQPalette &); private: TaskBarContainer* container; |