diff options
Diffstat (limited to 'kicker/taskbar/taskbarcontainer.cpp')
| -rw-r--r-- | kicker/taskbar/taskbarcontainer.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index f9ba06c32..e9cc87979 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twindowlistmenu.h> #include <X11/X.h> @@ -65,10 +65,10 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid TQFile configFileObject(locateLocal("config", configFile)); if (!configFileObject.exists()) { - TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true); TDEConfig localConfig(configFile); globalConfig.copyTo(configFile, &localConfig); - localConfig.writeEntry("UseGlobalSettings", TRUE); + localConfig.writeEntry("UseGlobalSettings", true); localConfig.sync(); } settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(configFile)); @@ -99,7 +99,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid taskBar = new TaskBar(settingsObject, globalSettingsObject, this); layout->addWidget( taskBar ); - connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) ); + connect( taskBar, TQ_SIGNAL( containerCountChanged() ), TQ_SIGNAL( containerCountChanged() ) ); setBackground(); @@ -134,10 +134,10 @@ void TaskBarContainer::configure() // window list button windowListButton = new SimpleButton(this); windowListMenu= new KWindowListMenu; - connect(windowListButton, TQT_SIGNAL(pressed()), - TQT_SLOT(showWindowListMenu())); - connect(windowListMenu, TQT_SIGNAL(aboutToHide()), - TQT_SLOT(windowListMenuAboutToHide())); + connect(windowListButton, TQ_SIGNAL(pressed()), + TQ_SLOT(showWindowListMenu())); + connect(windowListMenu, TQ_SIGNAL(aboutToHide()), + TQ_SLOT(windowListMenuAboutToHide())); // geometry TQString icon; @@ -161,7 +161,7 @@ void TaskBarContainer::configure() break; } - windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, + windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Panel, 16)); windowListButton->setMinimumSize(windowListButton->sizeHint()); @@ -188,20 +188,20 @@ void TaskBarContainer::preferences() { TQByteArray data; - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } if (configFile == GLOBAL_TASKBAR_CONFIG_FILE_NAME) { - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data); } else { TQDataStream args( data, IO_WriteOnly ); args << configFile; - kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data); + tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data); } } @@ -266,7 +266,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) if (windowListButton) { - windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, + windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon, TDEIcon::Panel, 16)); windowListButton->setMinimumSize(windowListButton->sizeHint()); @@ -299,9 +299,9 @@ void TaskBarContainer::showWindowListMenu() break; } - disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) ); + disconnect( windowListButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( showWindowListMenu() ) ); windowListMenu->exec( pos ); - TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton())); + TQTimer::singleShot(100, this, TQ_SLOT(reconnectWindowListButton())); } void TaskBarContainer::windowListMenuAboutToHide() @@ -313,7 +313,7 @@ void TaskBarContainer::windowListMenuAboutToHide() void TaskBarContainer::reconnectWindowListButton() { - connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); + connect( windowListButton, TQ_SIGNAL( pressed() ), TQ_SLOT( showWindowListMenu() ) ); } TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const |