diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:12:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:12:51 -0600 |
| commit | 65eca7929c22f0f0bc64135c02d85d1243df376c (patch) | |
| tree | 5b47361590fb6693a0f6258d6a8d725856ef2ad9 /kruler | |
| parent | cd6d514066c22206c388eddbb7fbec32648dbaeb (diff) | |
| download | tdegraphics-65eca7929c22f0f0bc64135c02d85d1243df376c.tar.gz tdegraphics-65eca7929c22f0f0bc64135c02d85d1243df376c.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kruler')
| -rw-r--r-- | kruler/klineal.cpp | 14 | ||||
| -rw-r--r-- | kruler/klineal.h | 6 | ||||
| -rw-r--r-- | kruler/main.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp index 686af2e5..6c81272a 100644 --- a/kruler/klineal.cpp +++ b/kruler/klineal.cpp @@ -67,7 +67,7 @@ static const uchar cursorBits[] = { * create the thingy with no borders and set up * its members */ -KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){ +KLineal::KLineal(TQWidget*parent,const char* name):TDEMainWindow(parent,name){ if (!name) { name = "klineal"; } @@ -143,9 +143,9 @@ KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){ _clicked = false; setOrientation(South); // setMediumLength(); - mMenu = new KPopupMenu(this); + mMenu = new TDEPopupMenu(this); mMenu->insertTitle(i18n("KRuler")); - KPopupMenu *oriMenu = new KPopupMenu(this); + TDEPopupMenu *oriMenu = new TDEPopupMenu(this); oriMenu->insertItem(UserIconSet("kruler-north"), i18n("&North"), this, TQT_SLOT(setNorth()), Key_N); oriMenu->insertItem(UserIconSet("kruler-east"), i18n("&East"), this, TQT_SLOT(setEast()), Key_E); oriMenu->insertItem(UserIconSet("kruler-south"), i18n("&South"), this, TQT_SLOT(setSouth()), Key_S); @@ -153,7 +153,7 @@ KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){ oriMenu->insertItem(i18n("&Turn Right"), this, TQT_SLOT(turnRight()), Key_R); oriMenu->insertItem(i18n("Turn &Left"), this, TQT_SLOT(turnLeft()), Key_L); mMenu->insertItem(i18n("&Orientation"), oriMenu); - mLenMenu = new KPopupMenu(this); + mLenMenu = new TDEPopupMenu(this); mLenMenu->insertItem(i18n("&Short"), this, TQT_SLOT(setShortLength()), CTRL+Key_S); mLenMenu->insertItem(i18n("&Medium"), this, TQT_SLOT(setMediumLength()), CTRL+Key_M); mLenMenu->insertItem(i18n("&Tall"), this, TQT_SLOT(setTallLength()), CTRL+Key_T); @@ -382,8 +382,8 @@ void KLineal::choseColor() { */ void KLineal::choseFont() { TQFont font = mScaleFont; - int result = KFontDialog::getFont(font, false, this); - if (result == KFontDialog::Accepted) { + int result = TDEFontDialog::getFont(font, false, this); + if (result == TDEFontDialog::Accepted) { setFont(font); } } @@ -515,7 +515,7 @@ void KLineal::keyPressEvent(TQKeyEvent *e) { dist.setY(1); break; default: - KMainWindow::keyPressEvent(e); + TDEMainWindow::keyPressEvent(e); return; } if (e->state() & ShiftButton) { diff --git a/kruler/klineal.h b/kruler/klineal.h index b2622e0a..1ec5f747 100644 --- a/kruler/klineal.h +++ b/kruler/klineal.h @@ -30,7 +30,7 @@ #include <tqwidget.h> #include <tqcursor.h> -class KLineal : public KMainWindow { +class KLineal : public TDEMainWindow { Q_OBJECT public: @@ -72,8 +72,8 @@ private: int mOrientation; int mLongEdgeLen; int mShortEdgeLen; - KPopupMenu *mMenu; - KPopupMenu *mLenMenu; + TDEPopupMenu *mMenu; + TDEPopupMenu *mLenMenu; TQColor mColor; TQColor mStoredColor; TQCursor mCurrentCursor; diff --git a/kruler/main.cpp b/kruler/main.cpp index b11b2b56..89096993 100644 --- a/kruler/main.cpp +++ b/kruler/main.cpp @@ -11,7 +11,7 @@ #define RESTORE_RULERS(type) { \ int n = 1; \ - while (KMainWindow::canBeRestored(n)) { \ + while (TDEMainWindow::canBeRestored(n)) { \ type* ruler = new type; \ ruler->restore(n); \ a.setMainWidget(ruler); \ |