From 2dc0abbac3a3e1dbadf10dcd5039e7807283932a Mon Sep 17 00:00:00 2001
From: Adam Mokhtari <adam.mokhtari@gmail.com>
Date: Sat, 24 Nov 2012 00:12:59 -0600
Subject: [PATCH] Removed deprecated Juce T() macros
---
Source/MainWindow.cpp | 6 +++---
Source/Processors/Editors/AudioEditor.cpp | 4 ++--
Source/Processors/Editors/MergerEditor.cpp | 4 ++--
Source/Processors/Editors/SplitterEditor.cpp | 4 ++--
Source/UI/ControlPanel.cpp | 8 ++++----
Source/UI/EditorViewport.cpp | 8 ++++----
Source/UI/UIComponent.cpp | 18 +++++++++---------
7 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp
index 3cec80f1f..041c06fe2 100644
--- a/Source/MainWindow.cpp
+++ b/Source/MainWindow.cpp
@@ -152,7 +152,7 @@ void MainWindow::loadWindowBounds()
XmlDocument doc (file);
XmlElement* xml = doc.getDocumentElement();
- if (xml == 0 || ! xml->hasTagName (T("MAINWINDOW")))
+ if (xml == 0 || ! xml->hasTagName ("MAINWINDOW"))
{
std::cout << "File not found." << std::endl;
@@ -161,7 +161,7 @@ void MainWindow::loadWindowBounds()
} else {
- String description;// = T(" ");
+ String description;
forEachXmlChildElement (*xml, e)
{
@@ -183,4 +183,4 @@ void MainWindow::loadWindowBounds()
delete xml;
}
// return "Everything went ok.";
-}
\ No newline at end of file
+}
diff --git a/Source/Processors/Editors/AudioEditor.cpp b/Source/Processors/Editors/AudioEditor.cpp
index 7ae4b9a38..70303bb18 100755
--- a/Source/Processors/Editors/AudioEditor.cpp
+++ b/Source/Processors/Editors/AudioEditor.cpp
@@ -87,7 +87,7 @@ AudioEditor::AudioEditor (AudioNode* owner)
audioWindowButton->setToggleState(false,false);
addAndMakeVisible(audioWindowButton);
- volumeSlider = new Slider (T("High-Cut Slider"));
+ volumeSlider = new Slider ("High-Cut Slider");
volumeSlider->setRange(0,100,1);
volumeSlider->addListener(this);
volumeSlider->setTextBoxStyle(Slider::NoTextBox,
@@ -224,4 +224,4 @@ void AudioConfigurationWindow::resized()
void AudioConfigurationWindow::paint(Graphics& g)
{
g.fillAll(Colours::darkgrey);
-}
\ No newline at end of file
+}
diff --git a/Source/Processors/Editors/MergerEditor.cpp b/Source/Processors/Editors/MergerEditor.cpp
index 2ed34b0b0..e3ba5f692 100755
--- a/Source/Processors/Editors/MergerEditor.cpp
+++ b/Source/Processors/Editors/MergerEditor.cpp
@@ -25,7 +25,7 @@
#include "../Utilities/Merger.h"
// PipelineSelectorButton::PipelineSelectorButton()
-// : DrawableButton (T("Selector"), DrawableButton::ImageFitted)
+// : DrawableButton ("Selector", DrawableButton::ImageFitted)
// {
// DrawablePath normal, over, down;
@@ -152,4 +152,4 @@ void MergerEditor::switchSource()
Merger* processor = (Merger*) getProcessor();
processor->switchIO();
-}
\ No newline at end of file
+}
diff --git a/Source/Processors/Editors/SplitterEditor.cpp b/Source/Processors/Editors/SplitterEditor.cpp
index cc82425a2..2d738171d 100755
--- a/Source/Processors/Editors/SplitterEditor.cpp
+++ b/Source/Processors/Editors/SplitterEditor.cpp
@@ -25,7 +25,7 @@
#include "../Utilities/Splitter.h"
// PipelineSelectorButton::PipelineSelectorButton()
-// : DrawableButton (T("Selector"), DrawableButton::ImageFitted)
+// : DrawableButton ("Selector", DrawableButton::ImageFitted)
// {
// DrawablePath normal, over, down;
@@ -158,4 +158,4 @@ void SplitterEditor::switchDest()
pipelineSelectorA->setToggleState(false,false);
}
-}
\ No newline at end of file
+}
diff --git a/Source/UI/ControlPanel.cpp b/Source/UI/ControlPanel.cpp
index 0908fb299..00ebfed00 100755
--- a/Source/UI/ControlPanel.cpp
+++ b/Source/UI/ControlPanel.cpp
@@ -27,7 +27,7 @@
#include <math.h>
PlayButton::PlayButton()
- : DrawableButton (T("PlayButton"), DrawableButton::ImageFitted)
+ : DrawableButton ("PlayButton", DrawableButton::ImageFitted)
{
DrawablePath normal, over, down;
@@ -61,7 +61,7 @@ PlayButton::~PlayButton()
}
RecordButton::RecordButton()
- : DrawableButton (T("RecordButton"), DrawableButton::ImageFitted)
+ : DrawableButton ("RecordButton", DrawableButton::ImageFitted)
{
DrawablePath normal, over, down;
@@ -88,7 +88,7 @@ RecordButton::~RecordButton()
}
-CPUMeter::CPUMeter() : Label(T("CPU Meter"),"0.0"), cpu(0.0f), lastCpu(0.0f)
+CPUMeter::CPUMeter() : Label("CPU Meter","0.0"), cpu(0.0f), lastCpu(0.0f)
{
MemoryInputStream mis(BinaryData::silkscreenserialized, BinaryData::silkscreenserializedSize, false);
Typeface::Ptr typeface = new CustomTypeface(mis);
@@ -688,4 +688,4 @@ void ControlPanel::toggleState()
cpb->toggleState();
getUIComponent()->childComponentChanged();
-}
\ No newline at end of file
+}
diff --git a/Source/UI/EditorViewport.cpp b/Source/UI/EditorViewport.cpp
index 5cc08659e..e83c1e63c 100755
--- a/Source/UI/EditorViewport.cpp
+++ b/Source/UI/EditorViewport.cpp
@@ -1005,8 +1005,8 @@ XmlElement* EditorViewport::createNodeXml (GenericEditor* editor,
std::cout << name << std::endl;
- e->setAttribute (T("name"), name);
- e->setAttribute (T("insertionPoint"), insertionPt);
+ e->setAttribute ("name", name);
+ e->setAttribute ("insertionPoint", insertionPt);
// source->stateSaved = true;
@@ -1176,7 +1176,7 @@ const String EditorViewport::loadState()
XmlDocument doc (currentFile);
XmlElement* xml = doc.getDocumentElement();
- if (xml == 0 || ! xml->hasTagName (T("PROCESSORGRAPH")))
+ if (xml == 0 || ! xml->hasTagName ("PROCESSORGRAPH"))
{
std::cout << "File not found." << std::endl;
delete xml;
@@ -1185,7 +1185,7 @@ const String EditorViewport::loadState()
clearSignalChain();
- String description;// = T(" ");
+ String description;// = " ";
int loadOrder = 0;
forEachXmlChildElement (*xml, signalChain)
diff --git a/Source/UI/UIComponent.cpp b/Source/UI/UIComponent.cpp
index fac6f5e79..ac731ed7c 100755
--- a/Source/UI/UIComponent.cpp
+++ b/Source/UI/UIComponent.cpp
@@ -303,37 +303,37 @@ void UIComponent::getCommandInfo (CommandID commandID, ApplicationCommandInfo& r
{
case openConfiguration:
result.setInfo("Open configuration", "Load a saved processor graph.", "General", 0);
- result.addDefaultKeypress (T('O'), ModifierKeys::commandModifier);
+ result.addDefaultKeypress ('O', ModifierKeys::commandModifier);
result.setActive(!acquisitionStarted);
break;
case saveConfiguration:
result.setInfo("Save configuration", "Save the current processor graph.", "General", 0);
- result.addDefaultKeypress (T('S'), ModifierKeys::commandModifier);
+ result.addDefaultKeypress ('S', ModifierKeys::commandModifier);
result.setActive(!acquisitionStarted);
break;
case undo:
result.setInfo("Undo", "Undo the last action.", "General", 0);
- result.addDefaultKeypress (T('Z'), ModifierKeys::commandModifier);
+ result.addDefaultKeypress ('Z', ModifierKeys::commandModifier);
result.setActive(false);
break;
case redo:
result.setInfo("Redo", "Undo the last action.", "General", 0);
- result.addDefaultKeypress (T('Y'), ModifierKeys::commandModifier);
+ result.addDefaultKeypress ('Y', ModifierKeys::commandModifier);
result.setActive(false);
break;
case copySignalChain:
result.setInfo("Copy", "Copy a portion of the signal chain.", "General", 0);
- result.addDefaultKeypress (T('C'), ModifierKeys::commandModifier);
+ result.addDefaultKeypress ('C', ModifierKeys::commandModifier);
result.setActive(false);
break;
case pasteSignalChain:
result.setInfo("Paste", "Paste a portion of the signal chain.", "General", 0);
- result.addDefaultKeypress (T('V'), ModifierKeys::commandModifier);
+ result.addDefaultKeypress ('V', ModifierKeys::commandModifier);
result.setActive(false);
break;
@@ -345,19 +345,19 @@ void UIComponent::getCommandInfo (CommandID commandID, ApplicationCommandInfo& r
case toggleProcessorList:
result.setInfo("Processor List", "Show/hide Processor List.", "General", 0);
- result.addDefaultKeypress (T('P'), ModifierKeys::shiftModifier);
+ result.addDefaultKeypress ('P', ModifierKeys::shiftModifier);
result.setTicked(processorList->isOpen());
break;
case toggleSignalChain:
result.setInfo("Signal Chain", "Show/hide Signal Chain.", "General", 0);
- result.addDefaultKeypress (T('S'), ModifierKeys::shiftModifier);
+ result.addDefaultKeypress ('S', ModifierKeys::shiftModifier);
result.setTicked(editorViewportButton->isOpen());
break;
case toggleFileInfo:
result.setInfo("File Info", "Show/hide File Info.", "General", 0);
- result.addDefaultKeypress (T('F'), ModifierKeys::shiftModifier);
+ result.addDefaultKeypress ('F', ModifierKeys::shiftModifier);
result.setTicked(controlPanel->isOpen());
break;
--
GitLab