diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:14:03 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:14:03 -0600 |
commit | 9c9412b30c54468adc9e506cc76c5d113fbf5056 (patch) | |
tree | 68a0c0d5bc770fc58596b8c5624cdf33d8625027 /krdc | |
parent | 2e53bd0b77676f879fad7baeecea5879bf496a7d (diff) | |
download | tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.tar.gz tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'krdc')
-rw-r--r-- | krdc/hostprofiles.ui | 2 | ||||
-rw-r--r-- | krdc/hostprofiles.ui.h | 2 | ||||
-rw-r--r-- | krdc/krdc.cpp | 28 | ||||
-rw-r--r-- | krdc/krdc.h | 4 | ||||
-rw-r--r-- | krdc/maindialogbase.ui | 2 | ||||
-rw-r--r-- | krdc/maindialogwidget.cpp | 4 |
6 files changed, 21 insertions, 21 deletions
diff --git a/krdc/hostprofiles.ui b/krdc/hostprofiles.ui index 25f52e48..f32ef2e5 100644 --- a/krdc/hostprofiles.ui +++ b/krdc/hostprofiles.ui @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Host</string> diff --git a/krdc/hostprofiles.ui.h b/krdc/hostprofiles.ui.h index a1577cc1..36be0998 100644 --- a/krdc/hostprofiles.ui.h +++ b/krdc/hostprofiles.ui.h @@ -71,7 +71,7 @@ void HostProfiles::load() while ( it != hplist.end() ) { HostPref *hp = *it; - new KListViewItem( hostListView, hp->host(), hp->type(), + new TDEListViewItem( hostListView, hp->host(), hp->type(), hp->prefDescription() ); ++it; } diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index 634921f6..b052f6b3 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -386,7 +386,7 @@ TQSize KRDC::sizeHint() } TQPopupMenu *KRDC::createPopupMenu(TQWidget *parent) const { - KPopupMenu *pu = new KPopupMenu(parent); + TDEPopupMenu *pu = new TDEPopupMenu(parent); pu->insertItem(i18n("View Only"), this, TQT_SLOT(viewOnlyToggled()), 0, VIEW_ONLY_ID); pu->setCheckable(true); pu->setItemChecked(VIEW_ONLY_ID, m_view->viewOnly()); @@ -467,7 +467,7 @@ void KRDC::switchToFullscreen(bool scaling) connect(m_fsToolbar, TQT_SIGNAL(mouseEnter()), TQT_SLOT(showFullscreenToolbar())); connect(m_fsToolbar, TQT_SIGNAL(mouseLeave()), TQT_SLOT(hideFullscreenToolbarDelayed())); - KToolBar *t = new KToolBar(m_fsToolbar); + TDEToolBar *t = new TDEToolBar(m_fsToolbar); m_fsToolbarWidget = t; t->setIconSize(KIcon::Panel); @@ -475,14 +475,14 @@ void KRDC::switchToFullscreen(bool scaling) pinIconSet.setPixmap(m_pinup, TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On); pinIconSet.setPixmap(m_pindown, TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::Off); t->insertButton("pinup", FS_AUTOHIDE_ID); - KToolBarButton *pinButton = t->getButton(FS_AUTOHIDE_ID); + TDEToolBarButton *pinButton = t->getButton(FS_AUTOHIDE_ID); pinButton->setIconSet(pinIconSet); TQToolTip::add(pinButton, i18n("Autohide on/off")); t->setToggle(FS_AUTOHIDE_ID); t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(setFsToolbarAutoHide(bool))); t->insertButton("window_nofullscreen", FS_FULLSCREEN_ID); - KToolBarButton *fullscreenButton = t->getButton(FS_FULLSCREEN_ID); + TDEToolBarButton *fullscreenButton = t->getButton(FS_FULLSCREEN_ID); TQToolTip::add(fullscreenButton, i18n("Fullscreen")); t->setToggle(FS_FULLSCREEN_ID); t->setButton(FS_FULLSCREEN_ID, true); @@ -490,7 +490,7 @@ void KRDC::switchToFullscreen(bool scaling) m_popup = createPopupMenu(t); t->insertButton("configure", FS_ADVANCED_ID, m_popup, true, i18n("Advanced options")); - KToolBarButton *advancedButton = t->getButton(FS_ADVANCED_ID); + TDEToolBarButton *advancedButton = t->getButton(FS_ADVANCED_ID); TQToolTip::add(advancedButton, i18n("Advanced options")); TQLabel *hostLabel = new TQLabel(t); @@ -502,7 +502,7 @@ void KRDC::switchToFullscreen(bool scaling) if (scalingPossible) { t->insertButton("viewmagfit", FS_SCALE_ID); - KToolBarButton *scaleButton = t->getButton(FS_SCALE_ID); + TDEToolBarButton *scaleButton = t->getButton(FS_SCALE_ID); TQToolTip::add(scaleButton, i18n("Scale view")); t->setToggle(FS_SCALE_ID); t->setButton(FS_SCALE_ID, scaling); @@ -510,12 +510,12 @@ void KRDC::switchToFullscreen(bool scaling) } t->insertButton("iconify", FS_ICONIFY_ID); - KToolBarButton *iconifyButton = t->getButton(FS_ICONIFY_ID); + TDEToolBarButton *iconifyButton = t->getButton(FS_ICONIFY_ID); TQToolTip::add(iconifyButton, i18n("Minimize")); t->addConnection(FS_ICONIFY_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(iconify())); t->insertButton("close", FS_CLOSE_ID); - KToolBarButton *closeButton = t->getButton(FS_CLOSE_ID); + TDEToolBarButton *closeButton = t->getButton(FS_CLOSE_ID); TQToolTip::add(closeButton, i18n("Close")); t->addConnection(FS_CLOSE_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(quit())); @@ -577,12 +577,12 @@ void KRDC::switchToNormal(bool scaling) m_dockArea = new TQDockArea(Qt::Horizontal, TQDockArea::Normal, this); m_dockArea->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); - KToolBar *t = new KToolBar(m_dockArea); + TDEToolBar *t = new TDEToolBar(m_dockArea); m_toolbar = t; - t->setIconText(KToolBar::IconTextRight); + t->setIconText(TDEToolBar::IconTextRight); connect(t, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(toolbarChanged())); t->insertButton("window_fullscreen", 0, true, i18n("Fullscreen")); - KToolBarButton *fullscreenButton = t->getButton(0); + TDEToolBarButton *fullscreenButton = t->getButton(0); TQToolTip::add(fullscreenButton, i18n("Fullscreen")); TQWhatsThis::add(fullscreenButton, i18n("Switches to full screen. If the remote desktop has a different screen resolution, Remote Desktop Connection will automatically switch to the nearest resolution.")); t->setToggle(0); @@ -591,7 +591,7 @@ void KRDC::switchToNormal(bool scaling) if (m_view->supportsScaling()) { t->insertButton("viewmagfit", 1, true, i18n("Scale")); - KToolBarButton *scaleButton = t->getButton(1); + TDEToolBarButton *scaleButton = t->getButton(1); TQToolTip::add(scaleButton, i18n("Scale view")); TQWhatsThis::add(scaleButton, i18n("This option scales the remote screen to fit your window size.")); t->setToggle(1); @@ -600,7 +600,7 @@ void KRDC::switchToNormal(bool scaling) } t->insertButton("key_enter", 2, true, i18n("Special Keys")); - KToolBarButton *skButton = t->getButton(2); + TDEToolBarButton *skButton = t->getButton(2); TQToolTip::add(skButton, i18n("Enter special keys.")); TQWhatsThis::add(skButton, i18n("This option allows you to send special key combinations like Ctrl-Alt-Del to the remote host.")); t->addConnection(2, TQT_SIGNAL(clicked()), TQT_TQOBJECT(m_keyCaptureDialog), TQT_SLOT(execute())); @@ -612,7 +612,7 @@ void KRDC::switchToNormal(bool scaling) m_popup = createPopupMenu(t); t->insertButton("configure", 3, m_popup, true, i18n("Advanced")); - KToolBarButton *advancedButton = t->getButton(3); + TDEToolBarButton *advancedButton = t->getButton(3); TQToolTip::add(advancedButton, i18n("Advanced options")); if (m_layout) diff --git a/krdc/krdc.h b/krdc/krdc.h index 58724b61..a55637fa 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -34,7 +34,7 @@ #include "keycapturedialog.h" class TQPixmap; -class KToolBar; +class TDEToolBar; class TQPopupMenu; class TQDockArea; @@ -76,7 +76,7 @@ private: TQWidget *m_fsToolbarWidget; // qt designer widget for fs toolbar // (invalid in normal mode) TQPixmap m_pinup, m_pindown; // fs toolbar imaged for autohide button - KToolBar *m_toolbar; // toolbar in normal mode (0 in fs mode) + TDEToolBar *m_toolbar; // toolbar in normal mode (0 in fs mode) TQDockArea *m_dockArea; // dock area for toolbar in normal mode (0 in fs mode) TQPopupMenu *m_popup; // advanced options popup (0 in fs mode) TQDesktopWidget m_desktopWidget; diff --git a/krdc/maindialogbase.ui b/krdc/maindialogbase.ui index c1757016..34006ec2 100644 --- a/krdc/maindialogbase.ui +++ b/krdc/maindialogbase.ui @@ -236,7 +236,7 @@ Remote Desktop Connection only supports systems that use VNC.</string> <string>An administrator can configure the network to have several scopes. If this is the case, you can select the scope to scan here.</string> </property> </widget> - <widget class="KListView" row="1" column="0" rowspan="1" colspan="7"> + <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="7"> <column> <property name="text"> <string>Name</string> diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index 09b0de52..befd8656 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -34,14 +34,14 @@ static const TQString DEFAULT_SCOPE = "default"; -class UrlListViewItem : public KListViewItem +class UrlListViewItem : public TDEListViewItem { public: UrlListViewItem( TQListView *v, const TQString &url, const TQString &host, const TQString &protocol, const TQString &type, const TQString &userid, const TQString &fullname, const TQString &desc, const TQString &serviceid ) - : KListViewItem( v, host, i18n( "unknown" ), host, protocol ), + : TDEListViewItem( v, host, i18n( "unknown" ), host, protocol ), m_url( url ), m_serviceid( serviceid ) { if ( !type.isNull() ) |