diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:25 -0600 |
| commit | f59dfa08651a47f21d004e8e4cb5020b8035287e (patch) | |
| tree | 0582273566661474af14fe8f1737cfe1e6527d46 /kaboodle | |
| parent | 83fbc82a101309e171089f0d5ed080f82a367345 (diff) | |
| download | tdemultimedia-f59dfa08651a47f21d004e8e4cb5020b8035287e.tar.gz tdemultimedia-f59dfa08651a47f21d004e8e4cb5020b8035287e.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.
Diffstat (limited to 'kaboodle')
| -rw-r--r-- | kaboodle/player.cpp | 4 | ||||
| -rw-r--r-- | kaboodle/userinterface.cpp | 2 | ||||
| -rw-r--r-- | kaboodle/view.cpp | 12 | ||||
| -rw-r--r-- | kaboodle/view.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp index 70517c2d..0d384ded 100644 --- a/kaboodle/player.cpp +++ b/kaboodle/player.cpp @@ -244,8 +244,8 @@ void Kaboodle::Player::tickerTimeout(void) if(extension) emit setStatusBarText(i18n("Playing %1 - %2") - .arg(current.prettyURL()) - .arg(positionString() + "/" + lengthString())); + .tqarg(current.prettyURL()) + .tqarg(positionString() + "/" + lengthString())); } updateTitle(); diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp index 2308f31d..10f7e56e 100644 --- a/kaboodle/userinterface.cpp +++ b/kaboodle/userinterface.cpp @@ -35,7 +35,7 @@ #include <kstdaction.h> #include <kurldrag.h> #include <tqdragobject.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlcdnumber.h> #include <tqvbox.h> #include <kkeydialog.h> diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index 0b586843..437af5b0 100644 --- a/kaboodle/view.cpp +++ b/kaboodle/view.cpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kvideowidget.h> #include <tqdragobject.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -80,10 +80,10 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p) sliderBox->setFocusPolicy(TQ_ClickFocus); sliderBox->setAcceptDrops(true); - TQHBoxLayout *layout = new TQHBoxLayout(sliderBox); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(0); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(sliderBox); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(0); + tqlayout->setAutoAdd(true); playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQT_SLOT(play()), sliderBox); pauseButton = createButton(BarIconSet("player_pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox); @@ -99,7 +99,7 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p) labelFont.setBold(true); TQFontMetrics labelFontMetrics(labelFont); elapsedLabel->setFont(labelFont); - elapsedLabel->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); + elapsedLabel->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); elapsedLabel->setFixedHeight(labelFontMetrics.height()); elapsedLabel->setMinimumWidth(labelFontMetrics.width("00:00")); diff --git a/kaboodle/view.h b/kaboodle/view.h index 284f5621..75ed28b4 100644 --- a/kaboodle/view.h +++ b/kaboodle/view.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kurl.h> #include <tqevent.h> #include <tqhbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlcdnumber.h> #include <tqwidget.h> |